Linus Torvalds
28f3d71761
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...
Pull more networking updates from David Miller:
"Ok, everything from here on out will be bug fixes."
1) One final sync of wireless and bluetooth stuff from John Linville.
These changes have all been in his tree for more than a week, and
therefore have had the necessary -next exposure. John was just away
on a trip and didn't have a change to send the pull request until a
day or two ago.
2) Put back some defines in user exposed header file areas that were
removed during the tokenring purge. From Stephen Hemminger and Paul
Gortmaker.
3) A bug fix for UDP hash table allocation got lost in the pile due to
one of those "you got it.. no I've got it.." situations. :-)
From Tim Bird.
4) SKB coalescing in TCP needs to have stricter checks, otherwise we'll
try to coalesce overlapping frags and crash. Fix from Eric Dumazet.
5) RCU routing table lookups can race with free_fib_info(), causing
crashes when we deref the device pointers in the route. Fix by
releasing the net device in the RCU callback. From Yanmin Zhang.
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (293 commits)
tcp: take care of overlaps in tcp_try_coalesce()
ipv4: fix the rcu race between free_fib_info and ip_route_output_slow
mm: add a low limit to alloc_large_system_hash
ipx: restore token ring define to include/linux/ipx.h
if: restore token ring ARP type to header
xen: do not disable netfront in dom0
phy/micrel: Fix ID of KSZ9021
mISDN: Add X-Tensions USB ISDN TA XC-525
gianfar:don't add FCB length to hard_header_len
Bluetooth: Report proper error number in disconnection
Bluetooth: Create flags for bt_sk()
Bluetooth: report the right security level in getsockopt
Bluetooth: Lock the L2CAP channel when sending
Bluetooth: Restore locking semantics when looking up L2CAP channels
Bluetooth: Fix a redundant and problematic incoming MTU check
Bluetooth: Add support for Foxconn/Hon Hai AR5BBU22 0489:E03C
Bluetooth: Fix EIR data generation for mgmt_device_found
Bluetooth: Fix Inquiry with RSSI event mask
Bluetooth: improve readability of l2cap_seq_list code
Bluetooth: Fix skb length calculation
...
2012-05-24 11:54:29 -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: fix cfg80211_can_beacon_sec_chan prototype
2012-05-16 13:08:15 -04: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
set fake_rtable's dst to NULL to avoid kernel Oops
2012-04-24 00:16:24 -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
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
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
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
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
Merge branch 'for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
2012-05-22 17:40:19 -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/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
28f3d71761