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: [ATM]: [lec] use refcnt to protect lec_arp_entries outside lock [ATM]: [lec] add reference counting to lec_arp entries [ATM]: [lec] use work queue instead of timer for lec arp expiry [ATM]: [lec] old_close is no longer used [ATM]: [lec] convert lec_arp_table to hlist [ATM]: [lec] header indent, comment and whitespace cleanup [ATM]: [lec] indent, comment and whitespace cleanup [continued] [ATM]: [lec] indent, comment and whitespace cleanup [SCTP]: Do not timestamp every SCTP packet. [SCTP]: Use correct mask when disabling PMTUD. [SCTP]: Include sk_buff overhead while updating the peer's receive window. [SCTP]: Enable Nagle algorithm by default. [BNX2]: Disable MSI on 5706 if AMD 8132 bridge is present. [NetLabel]: audit fixups due to delayed feedback
Showing
- drivers/net/bnx2.c 30 additions, 2 deletionsdrivers/net/bnx2.c
- include/linux/atmlec.h 64 additions, 55 deletionsinclude/linux/atmlec.h
- include/linux/audit.h 5 additions, 6 deletionsinclude/linux/audit.h
- include/linux/pci_ids.h 1 addition, 0 deletionsinclude/linux/pci_ids.h
- include/net/cipso_ipv4.h 2 additions, 2 deletionsinclude/net/cipso_ipv4.h
- include/net/netlabel.h 7 additions, 1 deletioninclude/net/netlabel.h
- net/atm/lec.c 1556 additions, 1605 deletionsnet/atm/lec.c
- net/atm/lec.h 94 additions, 78 deletionsnet/atm/lec.h
- net/atm/lec_arpc.h 75 additions, 71 deletionsnet/atm/lec_arpc.h
- net/ipv4/cipso_ipv4.c 2 additions, 2 deletionsnet/ipv4/cipso_ipv4.c
- net/netlabel/netlabel_cipso_v4.c 29 additions, 19 deletionsnet/netlabel/netlabel_cipso_v4.c
- net/netlabel/netlabel_domainhash.c 43 additions, 39 deletionsnet/netlabel/netlabel_domainhash.c
- net/netlabel/netlabel_domainhash.h 5 additions, 3 deletionsnet/netlabel/netlabel_domainhash.h
- net/netlabel/netlabel_mgmt.c 19 additions, 8 deletionsnet/netlabel/netlabel_mgmt.c
- net/netlabel/netlabel_unlabeled.c 23 additions, 11 deletionsnet/netlabel/netlabel_unlabeled.c
- net/netlabel/netlabel_user.c 8 additions, 58 deletionsnet/netlabel/netlabel_user.c
- net/netlabel/netlabel_user.h 14 additions, 2 deletionsnet/netlabel/netlabel_user.h
- net/sctp/input.c 1 addition, 7 deletionsnet/sctp/input.c
- net/sctp/output.c 8 additions, 2 deletionsnet/sctp/output.c
- net/sctp/outqueue.c 2 additions, 1 deletionnet/sctp/outqueue.c
Loading
Please register or sign in to comment