Linus Torvalds
701b259f44
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...
Davem says:
1) Fix JIT code generation on x86-64 for divide by zero, from Eric Dumazet.
2) tg3 header length computation correction from Eric Dumazet.
3) More build and reference counting fixes for socket memory cgroup
code from Glauber Costa.
4) module.h snuck back into a core header after all the hard work we
did to remove that, from Paul Gortmaker and Jesper Dangaard Brouer.
5) Fix PHY naming regression and add some new PCI IDs in stmmac, from
Alessandro Rubini.
6) Netlink message generation fix in new team driver, should only advertise
the entries that changed during events, from Jiri Pirko.
7) SRIOV VF registration and unregistration fixes, and also add a
missing PCI ID, from Roopa Prabhu.
8) Fix infinite loop in tx queue flush code of brcmsmac, from Stanislaw Gruszka.
9) ftgmac100/ftmac100 build fix, missing interrupt.h include.
10) Memory leak fix in net/hyperv do_set_mutlicast() handling, from Wei Yongjun.
11) Off by one fix in netem packet scheduler, from Vijay Subramanian.
12) TCP loss detection fix from Yuchung Cheng.
13) TCP reset packet MD5 calculation uses wrong address, fix from Shawn Lu.
14) skge carrier assertion and DMA mapping fixes from Stephen Hemminger.
15) Congestion recovery undo performed at the wrong spot in BIC and CUBIC
congestion control modules, fix from Neal Cardwell.
16) Ethtool ETHTOOL_GSSET_INFO is unnecessarily restrictive, from Michał Mirosław.
17) Fix triggerable race in ipv6 sysctl handling, from Francesco Ruggeri.
18) Statistics bug fixes in mlx4 from Eugenia Emantayev.
19) rds locking bug fix during info dumps, from your's truly.
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (67 commits)
rds: Make rds_sock_lock BH rather than IRQ safe.
netprio_cgroup.h: dont include module.h from other includes
net: flow_dissector.c missing include linux/export.h
team: send only changed options/ports via netlink
net/hyperv: fix possible memory leak in do_set_multicast()
drivers/net: dsa/mv88e6xxx.c files need linux/module.h
stmmac: added PCI identifiers
llc: Fix race condition in llc_ui_recvmsg
stmmac: fix phy naming inconsistency
dsa: Add reporting of silicon revision for Marvell 88E6123/88E6161/88E6165 switches.
tg3: fix ipv6 header length computation
skge: add byte queue limit support
mv643xx_eth: Add Rx Discard and Rx Overrun statistics
bnx2x: fix compilation error with SOE in fw_dump
bnx2x: handle CHIP_REVISION during init_one
bnx2x: allow user to change ring size in ISCSI SD mode
bnx2x: fix Big-Endianess in ethtool -t
bnx2x: fixed ethtool statistics for MF modes
bnx2x: credit-leakage fixup on vlan_mac_del_all
macvlan: fix a possible use after free
...
2012-01-24 15:51:40 -08:00
9p: Reduce object size with CONFIG_NET_9P_DEBUG
2012-01-05 10:51:44 -06:00
bluetooth: hci: Fix type of "enable_hs" to bool.
2012-01-22 15:08:46 -05:00
caif-spi: Bugfix for dump upon device removal
2011-12-06 13:34:12 -05:00
Fix common misspellings
2011-03-31 11:26:23 -03:00
af_iucv: get rid of state IUCV_SEVERED
2011-12-20 14:05:03 -05:00
Merge branch 'nf-next' of git://1984.lsi.us.es/net-next
2011-12-25 02:21:45 -05:00
per-netns ipv4 sysctl_tcp_mem
2011-12-12 19:04:11 -05:00
NFC: Export a new attribute nfcid1 in target info
2012-01-04 14:30:43 -05:00
net: dont hold rtnl mutex during netlink dump callbacks
2011-05-02 15:26:28 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2011-12-23 17:13:56 -05:00
net: sched: constify tcf_proto and tc_action
2011-07-06 02:52:16 -07:00
ipv6: Check RA for sllao when configuring optimistic ipv6 address (v2)
2012-01-04 15:53:20 -05:00
net: Remove __KERNEL__ cpp checks from include/net
2011-04-24 10:54:56 -07:00
af_unix: Move CINQ/COUTQ code to helpers
2011-12-30 16:45:45 -05:00
ipv6: Use universal hash for NDISC.
2011-12-28 15:06:58 -05:00
atm: clip: Use device neigh support on top of "arp_tbl".
2011-11-30 18:51:03 -05:00
atomic: use <linux/atomic.h>
2011-07-26 16:49:47 -07:00
cfg80211: remove unused wext handler exports
2011-08-08 14:26:29 -04:00
kernel-doc: fix new warnings in cfg80211.h
2012-01-23 08:44:54 -08:00
doc: Update the email address for Paul Moore in various source files
2011-08-01 17:58:33 -07:00
net: Add sendmmsg socket system call
2011-05-05 11:10:14 -07:00
dcb: Add stub routines for !CONFIG_DCB
2011-10-06 15:49:51 -04:00
dcb: add DCBX mode to event notifier attributes
2011-10-06 15:49:51 -04:00
dsa: Include linux/if_ether.h to fix build error
2011-12-01 11:41:06 -05:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2011-12-23 17:13:56 -05:00
net: Rename the dst_opt default_mtu method to mtu
2011-11-26 14:29:50 -05:00
net: fix some sparse errors
2012-01-17 10:31:12 -05:00
flow_dissector: use a 64bit load/store
2011-11-29 13:17:03 -05:00
garp: remove last synchronize_rcu() call
2011-05-12 17:46:56 -04:00
Fix common misspellings
2011-03-31 11:26:23 -03:00
genetlink: Add genl_notify()
2011-12-03 09:35:05 -08:00
ipv4: reduce percpu needs for icmpmsg mibs
2011-11-09 16:04:20 -05:00
wireless: move ieee80211chan2mhz macro
2011-11-11 12:32:50 -05:00
6LoWPAN: add fragmentation support
2011-11-14 00:19:42 -05:00
ipv6: updates to privacy addresses per RFC 4941.
2011-08-01 18:05:00 -07:00
inet: Pass flowi to ->queue_xmit().
2011-05-08 15:28:28 -07:00
net: use IS_ENABLED(CONFIG_IPV6)
2011-12-11 18:25:16 -05:00
net: rename sk_clone to sk_clone_lock
2011-11-08 17:07:07 -05:00
inet: add rfc 3168 extract in front of INET_ECN_encapsulate()
2011-10-22 01:25:23 -04:00
atomic: use <linux/atomic.h>
2011-07-26 16:49:47 -07:00
net: use IS_ENABLED(CONFIG_IPV6)
2011-12-11 18:25:16 -05:00
inet: remove rcu protection on tw_net
2011-12-14 13:34:55 -05:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2011-12-02 13:49:21 -05:00
net: use IS_ENABLED(CONFIG_IPV6)
2011-12-11 18:25:16 -05:00
IPv6: Avoid taking write lock for /proc/net/ipv6_route
2011-12-30 17:07:33 -05:00
Merge branch 'nf-next' of git://1984.lsi.us.es/net-next
2011-12-25 02:21:45 -05:00
ipv4: Call fib_select_default() only when actually necessary.
2011-04-14 15:05:22 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-01-02 18:56:49 -05:00
ipv6: Add fragment reporting to ipv6_skip_exthdr().
2011-12-03 09:35:10 -08:00
net: Remove __KERNEL__ cpp checks from include/net
2011-04-24 10:54:56 -07:00
Fix common misspellings
2011-03-31 11:26:23 -03:00
wan: make LAPB callbacks const
2011-09-16 19:20:20 -04:00
include: replace linux/module.h with "struct module" wherever possible
2011-10-31 19:32:32 -04:00
atomic: use <linux/atomic.h>
2011-07-26 16:49:47 -07:00
bonding,llc: Fix structure sizeof incompatibility for some PDUs
2011-05-13 15:13:24 -04:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-01-08 13:21:22 -08:00
ipv6: Create fast inline ipv6 neigh lookup just like ipv4.
2011-12-28 15:41:23 -05:00
ipv6: Use universal hash for NDISC.
2011-12-28 15:06:58 -05:00
net: use IS_ENABLED(CONFIG_IPV6)
2011-12-11 18:25:16 -05:00
net: Kill ratelimit.h dependency in linux/net.h
2011-05-27 13:41:33 -04:00
net: Remove __KERNEL__ cpp checks from include/net
2011-04-24 10:54:56 -07:00
doc: Update the email address for Paul Moore in various source files
2011-08-01 17:58:33 -07:00
netlink: clarify attribute length check documentation
2011-11-04 17:48:23 -04:00
netprio_cgroup.h: dont include module.h from other includes
2012-01-24 16:42:26 -05:00
net: ping: fix build failure
2011-05-17 14:16:58 -04:00
net: sched: constify tcf_proto and tc_action
2011-07-06 02:52:16 -07:00
net: use IS_ENABLED(CONFIG_IPV6)
2011-12-11 18:25:16 -05:00
net: Remove __KERNEL__ cpp checks from include/net
2011-04-24 10:54:56 -07:00
net_sched: sfq: add optional RED on top of SFQ
2012-01-12 20:05:28 -08:00
cfg80211: pass DFS region to drivers through reg_notifier()
2011-11-21 16:20:41 -05:00
tcp: Change possible SYN flooding messages
2011-09-15 14:49:43 -04:00
rose: Add length checks to CALL_REQUEST parsing
2011-03-27 17:59:04 -07:00
route: struct rtable can be const in rt_is_input_route and rt_is_output_route
2011-11-26 14:29:51 -05:00
rtnetlink: Compute and store minimum ifinfo dump size
2011-06-09 20:38:07 -07:00
net: sch_generic remove redundant use of <linux/module.h>
2011-10-31 19:32:25 -04:00
af_unix: dont send SCM_CREDENTIALS by default
2011-09-28 13:29:50 -04:00
tcp: add const qualifiers where possible
2011-10-21 05:22:42 -04:00
Merge branch 'for-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
2012-01-09 13:08:28 -08:00
net: introduce res_counter_charge_nofail() for socket allocations
2012-01-22 15:08:46 -05:00
tcp: Replace constants with #define macros
2011-12-21 01:03:23 -05:00
tcp buffer limitation: per-cgroup limit
2011-12-12 19:04:11 -05:00
net: relax PKTINFO non local ipv6 udp xmit check
2011-08-30 17:39:01 -04:00
net: use IS_ENABLED(CONFIG_IPV6)
2011-12-11 18:25:16 -05:00
udplite: fast-path computation of checksum coverage
2011-10-17 19:07:30 -04:00
net: wimax: Remove of unused 'rfkill_input' pointer
2011-06-24 17:50:44 -07:00
Fix common misspellings
2011-03-31 11:26:23 -03:00
net: remove ipv6_addr_copy()
2011-11-22 16:43:32 -05:00
701b259f44