original_kernel/net
Patrick McHardy 6aa895b047 vlan: Don't store VLAN tag in cb
Use a real skb member to store the skb to avoid clashes with qdiscs,
which are allowed to use the cb area themselves. As currently only real
devices that consume the skb set the NETIF_F_HW_VLAN_TX flag, no explicit
invalidation is neccessary.

The new member fills a hole on 64 bit, the skb layout changes from:

        __u32                      mark;                 /*   172     4 */
        sk_buff_data_t             transport_header;     /*   176     4 */
        sk_buff_data_t             network_header;       /*   180     4 */
        sk_buff_data_t             mac_header;           /*   184     4 */
        sk_buff_data_t             tail;                 /*   188     4 */
        /* --- cacheline 3 boundary (192 bytes) --- */
        sk_buff_data_t             end;                  /*   192     4 */

        /* XXX 4 bytes hole, try to pack */

to

        __u32                      mark;                 /*   172     4 */
        __u16                      vlan_tci;             /*   176     2 */

        /* XXX 2 bytes hole, try to pack */

        sk_buff_data_t             transport_header;     /*   180     4 */
        sk_buff_data_t             network_header;       /*   184     4 */

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
2008-07-14 22:49:06 -07:00
..
9p
802
8021q 8021q: Check return of dev_set_promiscuity/allmulti 2008-07-14 20:59:03 -07:00
appletalk
atm
ax25
bluetooth
bridge bridge: Check return of dev_set_promiscuity 2008-07-14 20:53:13 -07:00
can
core vlan: Don't store VLAN tag in cb 2008-07-14 22:49:06 -07:00
dccp
decnet
econet
ethernet
ieee80211
ipv4 ipv4: Fix ipmr unregister device oops 2008-07-14 20:56:34 -07:00
ipv6 ipv6: Fix using after dev_put() 2008-07-14 20:54:54 -07:00
ipx
irda
iucv
key
lapb
llc
mac80211 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 2008-07-14 20:40:34 -07:00
netfilter Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2008-07-14 20:23:54 -07:00
netlabel netlabel: return msg overflow error from netlbl_cipsov4_list faster 2008-07-14 22:28:25 -07:00
netlink
netrom
packet af_packet: Check return of dev_set_promiscuity/allmulti 2008-07-14 20:49:46 -07:00
rfkill
rose
rxrpc
sched net-sched: cls_flow: add perturbation support 2008-07-14 20:36:32 -07:00
sctp
sunrpc
tipc tipc: Optimization to multicast name lookup algorithm 2008-07-14 22:45:33 -07:00
unix
wanrouter net: Remove references to wan-router.txt in Kconfigs 2008-07-14 22:22:29 -07:00
wireless wext: make sysfs bits optional and deprecate them 2008-07-14 14:52:57 -04:00
x25
xfrm
Kconfig
Makefile
TUNABLE
compat.c
nonet.c
socket.c
sysctl_net.c