forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next

Browse source
This commit is contained in:
David S. Miller 2012-02-12 17:05:16 -05:00
commit 3cc26e36a0
5 changed files with 511 additions and 288 deletions
Download patch file Download diff file Expand all files Collapse all files

9
include/linux/skbuff.h
View file

@ -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;