diff options
| author | David S. Miller | 2012-02-12 23:05:16 +0100 |
|---|---|---|
| committer | David S. Miller | 2012-02-12 23:05:16 +0100 |
| commit | 3cc26e36a0862f8d6906bd2ad6d371f2933bc355 (patch) | |
| tree | 12c4d9d282802bd7252d7ef88a72ec3d5799dc5d /include | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| parent | skbuff: Move rxhash and vlan_tci to consolidate holes in sk_buff (diff) | |
| download | kernel-qcow2-linux-3cc26e36a0862f8d6906bd2ad6d371f2933bc355.tar.gz kernel-qcow2-linux-3cc26e36a0862f8d6906bd2ad6d371f2933bc355.tar.xz kernel-qcow2-linux-3cc26e36a0862f8d6906bd2ad6d371f2933bc355.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/skbuff.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 50db9b04a552..2b7317ff297f 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -438,6 +438,11 @@ struct sk_buff { #endif int skb_iif; + + __u32 rxhash; + + __u16 vlan_tci; + #ifdef CONFIG_NET_SCHED __u16 tc_index; /* traffic control index */ #ifdef CONFIG_NET_CLS_ACT @@ -445,8 +450,6 @@ struct sk_buff { #endif #endif - __u32 rxhash; - __u16 queue_mapping; kmemcheck_bitfield_begin(flags2); #ifdef CONFIG_IPV6_NDISC_NODETYPE @@ -470,8 +473,6 @@ struct sk_buff { __u32 dropcount; }; - __u16 vlan_tci; - sk_buff_data_t transport_header; sk_buff_data_t network_header; sk_buff_data_t mac_header; |