Team driver updates (Jiri Pirko)
This commit is contained in:
parent
e0377be22b
commit
8c7aca4e02
|
@ -664,6 +664,7 @@ Patch110: vmbugon-warnon.patch
|
|||
|
||||
Patch150: team-net-next-20120808.patch
|
||||
Patch151: team-net-next-update-20120927.patch
|
||||
Patch152: team-net-next-20121205.patch
|
||||
|
||||
Patch390: linux-2.6-defaults-acpi-video.patch
|
||||
Patch391: linux-2.6-acpi-video-dos.patch
|
||||
|
@ -1383,6 +1384,7 @@ ApplyPatch vmbugon-warnon.patch
|
|||
|
||||
ApplyPatch team-net-next-20120808.patch
|
||||
ApplyPatch team-net-next-update-20120927.patch
|
||||
ApplyPatch team-net-next-20121205.patch
|
||||
|
||||
# Architecture patches
|
||||
# x86(-64)
|
||||
|
@ -2440,6 +2442,9 @@ fi
|
|||
# ||----w |
|
||||
# || ||
|
||||
%changelog
|
||||
* Wed Dec 05 2012 Dave Jones <davej@redhat.com>
|
||||
- Team driver updates (Jiri Pirko)
|
||||
|
||||
* Mon Dec 03 2012 Josh Boyer <jwboyer@redhat.com> - 3.6.9-2
|
||||
- Backport 3 upstream fixes to resolve radeon schedule IB errors (rhbz 855275)
|
||||
|
||||
|
|
|
@ -0,0 +1,60 @@
|
|||
|
||||
Backport fixes from linus's tree.
|
||||
|
||||
upstream commits backported:
|
||||
commit 403f43c937d24832b18524f65415c0bbba6b5064
|
||||
team: bcast: convert return value of team_dev_queue_xmit() to bool correctly
|
||||
commit 3ed7147189d2fbe8ac6da95db2fd9d6d52f53ce9
|
||||
team: fix hw_features setup
|
||||
|
||||
Signed-off-by: Jiri Pirko <jpirko@redhat.com>
|
||||
---
|
||||
drivers/net/team/team.c | 4 +++-
|
||||
drivers/net/team/team_mode_broadcast.c | 6 +++---
|
||||
2 files changed, 6 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
|
||||
index 5d8e1cb..f504773 100644
|
||||
--- a/drivers/net/team/team.c
|
||||
+++ b/drivers/net/team/team.c
|
||||
@@ -1792,10 +1792,12 @@ static void team_setup(struct net_device *dev)
|
||||
|
||||
dev->features |= NETIF_F_LLTX;
|
||||
dev->features |= NETIF_F_GRO;
|
||||
- dev->hw_features = NETIF_F_HW_VLAN_TX |
|
||||
+ dev->hw_features = TEAM_VLAN_FEATURES |
|
||||
+ NETIF_F_HW_VLAN_TX |
|
||||
NETIF_F_HW_VLAN_RX |
|
||||
NETIF_F_HW_VLAN_FILTER;
|
||||
|
||||
+ dev->hw_features &= ~(NETIF_F_ALL_CSUM & ~NETIF_F_HW_CSUM);
|
||||
dev->features |= dev->hw_features;
|
||||
}
|
||||
|
||||
diff --git a/drivers/net/team/team_mode_broadcast.c b/drivers/net/team/team_mode_broadcast.c
|
||||
index 9db0171..c5db428 100644
|
||||
--- a/drivers/net/team/team_mode_broadcast.c
|
||||
+++ b/drivers/net/team/team_mode_broadcast.c
|
||||
@@ -29,8 +29,8 @@ static bool bc_transmit(struct team *team, struct sk_buff *skb)
|
||||
if (last) {
|
||||
skb2 = skb_clone(skb, GFP_ATOMIC);
|
||||
if (skb2) {
|
||||
- ret = team_dev_queue_xmit(team, last,
|
||||
- skb2);
|
||||
+ ret = !team_dev_queue_xmit(team, last,
|
||||
+ skb2);
|
||||
if (!sum_ret)
|
||||
sum_ret = ret;
|
||||
}
|
||||
@@ -39,7 +39,7 @@ static bool bc_transmit(struct team *team, struct sk_buff *skb)
|
||||
}
|
||||
}
|
||||
if (last) {
|
||||
- ret = team_dev_queue_xmit(team, last, skb);
|
||||
+ ret = !team_dev_queue_xmit(team, last, skb);
|
||||
if (!sum_ret)
|
||||
sum_ret = ret;
|
||||
}
|
||||
--
|
||||
1.7.11.7
|
||||
|
Loading…
Reference in New Issue