summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorChangli Gao <xiaosuo@gmail.com>2011-08-18 22:07:54 -0700
committerDavid S. Miller <davem@davemloft.net>2011-08-18 22:07:54 -0700
commit1ff1986fc94ee711df3cf19d45f2abf351436a6d (patch)
tree8301dc9db8afac2dcd7cc864ac1abd56657d6f27 /net
parent939cf3069d31a6e0e335eb5e08ef04895f2d013d (diff)
downloadlinux-3.10-1ff1986fc94ee711df3cf19d45f2abf351436a6d.tar.gz
linux-3.10-1ff1986fc94ee711df3cf19d45f2abf351436a6d.tar.bz2
linux-3.10-1ff1986fc94ee711df3cf19d45f2abf351436a6d.zip
net: rps: support 802.1Q
For the 802.1Q packets, if the NIC doesn't support hw-accel-vlan-rx, RPS won't inspect the internal 4 tuples to generate skb->rxhash, so this kind of traffic can't get any benefit from RPS. This patch adds the support for 802.1Q to RPS. Signed-off-by: Changli Gao <xiaosuo@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/core/dev.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index ead0366ee1e..be7ee506f17 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2529,6 +2529,7 @@ void __skb_get_rxhash(struct sk_buff *skb)
int nhoff, hash = 0, poff;
const struct ipv6hdr *ip6;
const struct iphdr *ip;
+ const struct vlan_hdr *vlan;
u8 ip_proto;
u32 addr1, addr2;
u16 proto;
@@ -2565,6 +2566,13 @@ again:
addr2 = (__force u32) ip6->daddr.s6_addr32[3];
nhoff += 40;
break;
+ case __constant_htons(ETH_P_8021Q):
+ if (!pskb_may_pull(skb, sizeof(*vlan) + nhoff))
+ goto done;
+ vlan = (const struct vlan_hdr *) (skb->data + nhoff);
+ proto = vlan->h_vlan_encapsulated_proto;
+ nhoff += sizeof(*vlan);
+ goto again;
default:
goto done;
}