summaryrefslogtreecommitdiffstats
path: root/net/core/net-traces.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-09-28 10:09:33 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-09-28 10:09:33 -0700
commit6672d90fe779dc0dfffe027c3ede12609df091c2 (patch)
tree84e6984204030bf15685a5c26155f5731aaab244 /net/core/net-traces.c
parent7596824e6626c62557b9eb6411ee74fec68b8ff9 (diff)
parentdf555b665367f9de6c04826acc482096f17c243d (diff)
downloadlinux-6672d90fe779dc0dfffe027c3ede12609df091c2.tar.bz2
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Pull networking fixes from David S Miller: 1) Netfilter xt_limit module can use uninitialized rules, from Jan Engelhardt. 2) Wei Yongjun has found several more spots where error pointers were treated as NULL/non-NULL and vice versa. 3) bnx2x was converted to pci_io{,un}map() but one remaining plain iounmap() got missed. From Neil Horman. 4) Due to a fence-post type error in initialization of inetpeer entries (which is where we store the ICMP rate limiting information), we can erroneously drop ICMPs if the inetpeer was created right around when jiffies wraps. Fix from Nicolas Dichtel. 5) smsc75xx resume fix from Steve Glendinnig. 6) LAN87xx smsc chips need an explicit hardware init, from Marek Vasut. 7) qlcnic uses msleep() with locks held, fix from Narendra K. * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: netdev: octeon: fix return value check in octeon_mgmt_init_phy() inetpeer: fix token initialization qlcnic: Fix scheduling while atomic bug bnx2: Clean up remaining iounmap net: phy: smsc: Implement PHY config_init for LAN87xx smsc75xx: fix resume after device reset netdev: pasemi: fix return value check in pasemi_mac_phy_init() team: fix return value check l2tp: fix return value check netfilter: xt_limit: have r->cost != 0 case work
Diffstat (limited to 'net/core/net-traces.c')
0 files changed, 0 insertions, 0 deletions