Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [NETLINK]: Put {IFA,IFLA}_{RTA,PAYLOAD} macros back for userspace. [NET_SCHED] sch_htb: turn intermediate classes into leaves [NET_SCHED] sch_cbq: deactivating when grafting, purging etc. [XFRM]: Fix XFRMGRP_REPORT to use correct multicast group. [NET]: Force a cache line split in hh_cache in SMP. [NETPOLL]: make arp replies through netpoll use mac address of sender [NETLINK]: Restore API compatibility of address and neighbour bits [AX.25]: Fix default address and broadcast address initialization. [AX.25]: Constify ax25 utility functions [BNX2]: Add an error check. [NET]: Convert hh_lock to seqlock.
No related branches found
No related tags found
Showing
- drivers/net/bnx2.c 1 addition, 1 deletiondrivers/net/bnx2.c
- drivers/net/hamradio/6pack.c 2 additions, 7 deletionsdrivers/net/hamradio/6pack.c
- drivers/net/hamradio/baycom_epp.c 2 additions, 8 deletionsdrivers/net/hamradio/baycom_epp.c
- drivers/net/hamradio/bpqether.c 2 additions, 7 deletionsdrivers/net/hamradio/bpqether.c
- drivers/net/hamradio/dmascc.c 2 additions, 8 deletionsdrivers/net/hamradio/dmascc.c
- drivers/net/hamradio/hdlcdrv.c 2 additions, 14 deletionsdrivers/net/hamradio/hdlcdrv.c
- drivers/net/hamradio/mkiss.c 2 additions, 7 deletionsdrivers/net/hamradio/mkiss.c
- drivers/net/hamradio/scc.c 2 additions, 7 deletionsdrivers/net/hamradio/scc.c
- drivers/net/hamradio/yam.c 2 additions, 7 deletionsdrivers/net/hamradio/yam.c
- include/linux/if_addr.h 6 additions, 0 deletionsinclude/linux/if_addr.h
- include/linux/if_link.h 6 additions, 0 deletionsinclude/linux/if_link.h
- include/linux/netdevice.h 9 additions, 2 deletionsinclude/linux/netdevice.h
- include/linux/rtnetlink.h 2 additions, 0 deletionsinclude/linux/rtnetlink.h
- include/linux/xfrm.h 1 addition, 1 deletioninclude/linux/xfrm.h
- include/net/ax25.h 11 additions, 9 deletionsinclude/net/ax25.h
- include/net/neighbour.h 18 additions, 0 deletionsinclude/net/neighbour.h
- net/ax25/ax25_addr.c 23 additions, 11 deletionsnet/ax25/ax25_addr.c
- net/core/neighbour.c 6 additions, 5 deletionsnet/core/neighbour.c
- net/core/netpoll.c 10 additions, 4 deletionsnet/core/netpoll.c
- net/ipv4/ip_output.c 3 additions, 11 deletionsnet/ipv4/ip_output.c
Loading
Please register or sign in to comment