Linus Torvalds
13199a0845
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...
Pull networking changes from David S. Miller:
1) Fix IPSEC header length calculation for transport mode in ESP. The
issue is whether to do the calculation before or after alignment.
Fix from Benjamin Poirier.
2) Fix regression in IPV6 IPSEC fragment length calculations, from Gao
Feng. This is another transport vs tunnel mode issue.
3) Handle AF_UNSPEC connect()s properly in L2TP to avoid OOPSes. Fix
from James Chapman.
4) Fix USB ASIX driver's reception of full sized VLAN packets, from
Eric Dumazet.
5) Allow drop monitor (and, more generically, all generic netlink
protocols) to be automatically loaded as a module. From Neil
Horman.
Fix up trivial conflict in Documentation/feature-removal-schedule.txt
due to new entries added next to each other at the end. As usual.
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (38 commits)
net/smsc911x: Repair broken failure paths
virtio-net: remove useless disable on freeze
netdevice: Update netif_dbg for CONFIG_DYNAMIC_DEBUG
drop_monitor: Add module alias to enable automatic module loading
genetlink: Build a generic netlink family module alias
net: add MODULE_ALIAS_NET_PF_PROTO_NAME
r6040: Do a Proper deinit at errorpath and also when driver unloads (calling r6040_remove_one)
r6040: disable pci device if the subsequent calls (after pci_enable_device) fails
skb: avoid unnecessary reallocations in __skb_cow
net: sh_eth: fix the rxdesc pointer when rx descriptor empty happens
asix: allow full size 8021Q frames to be received
rds_rdma: don't assume infiniband device is PCI
l2tp: fix oops in L2TP IP sockets for connect() AF_UNSPEC case
mac80211: fix ADDBA declined after suspend with wowlan
wlcore: fix undefined symbols when CONFIG_PM is not defined
mac80211: fix flag check for QoS NOACK frames
ath9k_hw: apply internal regulator settings on AR933x
ath9k_hw: update AR933x initvals to fix issues with high power devices
ath9k: fix a use-after-free-bug when ath_tx_setup_buffer() fails
ath9k: stop rx dma before stopping tx
...
2012-05-31 10:32:36 -07:00
9p: Reduce object size with CONFIG_NET_9P_DEBUG
2012-01-05 10:51:44 -06:00
Bluetooth: Create flags for bt_sk()
2012-05-16 16:14:17 -03:00
caif-hsi: robust frame aggregation for HSI
2012-04-13 11:37:36 -04:00
af_iucv: add shutdown for HS transport
2012-03-07 22:52:24 -08:00
netfilter: nf_conntrack: use this_cpu_inc()
2012-05-08 19:36:33 +02:00
netfilter: nf_ct_helper: allow to disable automatic helper assignment
2012-05-08 19:35:18 +02:00
NFC: HCI drivers don't have to keep track of polling state
2012-05-15 17:31:22 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-05-16 22:17:37 -04:00
ipv6: bool/const conversions phase2
2012-05-19 01:08:16 -04:00
net: cleanup unsigned to unsigned int
2012-04-15 12:44:40 -04:00
ipv4: Eliminate spurious argument to __ipv4_neigh_lookup
2012-02-15 17:48:35 -05:00
atm: clip: Use device neigh support on top of "arp_tbl".
2011-11-30 18:51:03 -05:00
net ax25: Fix the build when sysctl support is disabled.
2012-04-23 22:14:47 -04:00
cfg80211: remove unused wext handler exports
2011-08-08 14:26:29 -04:00
cfg80211: fix cfg80211_can_beacon_sec_chan prototype
2012-05-16 13:08:15 -04:00
doc: Update the email address for Paul Moore in various source files
2011-08-01 17:58:33 -07:00
fq_codel: should use qdisc backlog as threshold
2012-05-16 15:30:26 -04:00
net: cleanup unsigned to unsigned int
2012-04-15 12:44:40 -04:00
dcb: Add stub routines for !CONFIG_DCB
2011-10-06 15:49:51 -04:00
net/dcb: Add an optional max rate attribute
2012-04-05 05:08:04 -04:00
net: cleanup unsigned to unsigned int
2012-04-15 12:44:40 -04:00
net: cleanup unsigned to unsigned int
2012-04-15 12:44:40 -04:00
net: cleanup unsigned to unsigned int
2012-04-15 12:44:40 -04:00
dsa: Include linux/if_ether.h to fix build error
2011-12-01 11:41:06 -05:00
ipv6: fix incorrect ipsec fragment
2012-05-27 01:11:22 -04:00
net: cleanup unsigned to unsigned int
2012-04-15 12:44:40 -04:00
ipv4: reset flowi parameters on route connect
2012-02-04 19:29:48 -05:00
flow_dissector: use a 64bit load/store
2011-11-29 13:17:03 -05:00
net: Deinline __nlmsg_put and genlmsg_put. -7k code on i386 defconfig.
2012-01-30 15:22:06 -05:00
net: cleanup unsigned to unsigned int
2012-04-15 12:44:40 -04: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
mac802154: declare reduced mlme operations
2012-05-16 15:16:56 -04:00
net: delete all instances of special processing for token ring
2012-05-15 20:14:35 -04:00
tcp: bind() use stronger condition for bind_conflict
2012-04-14 15:28:55 -04:00
net: use IS_ENABLED(CONFIG_IPV6)
2011-12-11 18:25:16 -05:00
ipv6: RTAX_FEATURE_ALLFRAG causes inefficient TCP segment sizing
2012-04-27 00:03:34 -04:00
inet: add rfc 3168 extract in front of INET_ECN_encapsulate()
2011-10-22 01:25:23 -04:00
ip_frag: struct inet_frags match() method returns a bool
2012-05-18 01:40:27 -04:00
atomic: use <linux/atomic.h>
2011-07-26 16:49:47 -07:00
net: implement IP_RECVTOS for IP_PKTOPTIONS
2012-02-13 00:46:41 -05:00
inet: remove rcu protection on tw_net
2011-12-14 13:34:55 -05:00
route: Remove redirect_genid
2012-03-08 00:30:32 -08:00
net: delete all instances of special processing for token ring
2012-05-15 20:14:35 -04:00
ipv6: clean up rt6_clean_expires
2012-04-17 22:31:59 -04:00
ipv6: bool/const conversions phase2
2012-05-19 01:08:16 -04:00
net: cleanup unsigned to unsigned int
2012-04-15 12:44:40 -04:00
ipvs: add support for sync threads
2012-05-08 19:40:33 +02:00
tunnel: implement 64 bits statistics
2012-04-14 14:47:05 -04:00
ipv6: bool/const conversions phase2
2012-05-19 01:08:16 -04:00
lapb: Neaten debugging
2012-05-17 18:45: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
net: cleanup unsigned to unsigned int
2012-04-15 12:44:40 -04:00
net: delete all instances of special processing for token ring
2012-05-15 20:14:35 -04:00
mac80211: (selectively) add HT details in radiotap
2012-05-16 12:46:38 -04:00
mac802154: RX data path
2012-05-16 15:16:44 -04:00
Treat ND option 31 as userland (DNSSL support)
2012-04-12 15:56:57 -04:00
net: cleanup unsigned to unsigned int
2012-04-15 12:44:40 -04:00
net sysctl: Add place holder functions for when sysctl support is compiled out of the kernel.
2012-04-23 19:24:28 -04:00
doc: Update the email address for Paul Moore in various source files
2011-08-01 17:58:33 -07:00
netlink: Delete all NLA_PUT*() macros.
2012-04-02 04:33:45 -04:00
netprio_cgroup: fix wrong memory access when NETPRIO_CGROUP=m
2012-02-10 15:08:57 -05:00
net: cleanup unsigned to unsigned int
2012-04-15 12:44:40 -04:00
net: use IS_ENABLED(CONFIG_IPV6)
2011-12-11 18:25:16 -05:00
ipv6: bool/const conversions phase2
2012-05-19 01:08:16 -04:00
net_sched: red: Make minor corrections to comments
2012-04-16 23:53:11 -04: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
net: cleanup unsigned to unsigned int
2012-04-15 12:44:40 -04:00
rtnetlink: ops->get_tx_queue() cannot take a const 'tb'.
2012-04-13 14:21:04 -04:00
net: Make qdisc_skb_cb upper size bound explicit.
2012-02-09 13:50:34 -05: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
memcg: decrement static keys at real destroy time
2012-05-29 16:22:28 -07:00
tcp: bool conversions
2012-05-17 14:59:59 -04:00
cgroup: pass struct mem_cgroup instead of struct cgroup to socket memcg
2012-04-10 10:04:07 -07:00
BUG: headers with BUG/BUG_ON etc. need linux/bug.h
2012-03-04 17:54:34 -05:00
net: relax PKTINFO non local ipv6 udp xmit check
2011-08-30 17:39:01 -04:00
net/ipv6/udp: UDP encapsulation: introduce encap_rcv hook into IPv6
2012-04-28 22:21:51 -04:00
net: ipv4: Standardize prefixes for message logging
2012-03-12 17:05:21 -07:00
net: cleanup unsigned to unsigned int
2012-04-15 12:44:40 -04:00
mac802154: monitor device support
2012-05-16 15:17:08 -04:00
net: cleanup unsigned to unsigned int
2012-04-15 12:44:40 -04:00
xfrm: Convert several xfrm policy match functions to bool.
2012-05-15 15:04:57 -04:00
13199a0845