summaryrefslogtreecommitdiffstats
path: root/drivers/net/bonding
diff options
context:
space:
mode:
authorMaciej Żenczykowski <maze@google.com>2011-10-24 21:04:16 +0200
committerDavid S. Miller <davem@davemloft.net>2011-10-26 01:22:23 +0200
commit59fdaca9a4497ada47328d7b4b406b98a6f1c1a6 (patch)
treef441fce4e551e8715cca1710563648b4c752fc17 /drivers/net/bonding
parentnet: Unlock sock before calling sk_free() (diff)
downloadlinux-59fdaca9a4497ada47328d7b4b406b98a6f1c1a6.tar.xz
linux-59fdaca9a4497ada47328d7b4b406b98a6f1c1a6.zip
net: make bonding slaves honour master's skb->priority
Signed-off-by: Maciej Żenczykowski <maze@google.com> Acked-by: Flavio Leitner <fbl@redhat.com> Signed-off-by: Jay Vosburgh <fubar@us.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bonding')
-rw-r--r--drivers/net/bonding/bond_main.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 71efff323941..c5944f1a4f9d 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -395,7 +395,6 @@ int bond_dev_queue_xmit(struct bonding *bond, struct sk_buff *skb,
struct net_device *slave_dev)
{
skb->dev = slave_dev;
- skb->priority = 1;
skb->queue_mapping = bond_queue_mapping(skb);