Linus Torvalds
9eb127cc04
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...
Pull networking fixes from David Miller:
1) Really fix tuntap SKB use after free bug, from Eric Dumazet.
2) Adjust SKB data pointer to point past the transport header before
calling icmpv6_notify() so that the headers are in the state which
that function expects. From Duan Jiong.
3) Fix ambiguities in the new tuntap multi-queue APIs. From Jason
Wang.
4) mISDN needs to use del_timer_sync(), from Konstantin Khlebnikov.
5) Don't destroy mutex after freeing up device private in mac802154,
fix also from Konstantin Khlebnikov.
6) Fix INET request socket leak in TCP and DCCP, from Christoph Paasch.
7) SCTP HMAC kconfig rework, from Neil Horman.
8) Fix SCTP jprobes function signature, otherwise things explode, from
Daniel Borkmann.
9) Fix typo in ipv6-offload Makefile variable reference, from Simon
Arlott.
10) Don't fail USBNET open just because remote wakeup isn't supported,
from Oliver Neukum.
11) be2net driver bug fixes from Sathya Perla.
12) SOLOS PCI ATM driver bug fixes from Nathan Williams and David
Woodhouse.
13) Fix MTU changing regression in 8139cp driver, from John Greene.
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (45 commits)
solos-pci: ensure all TX packets are aligned to 4 bytes
solos-pci: add firmware upgrade support for new models
solos-pci: remove superfluous debug output
solos-pci: add GPIO support for newer versions on Geos board
8139cp: Prevent dev_close/cp_interrupt race on MTU change
net: qmi_wwan: add ZTE MF880
drivers/net: Use of_match_ptr() macro in smsc911x.c
drivers/net: Use of_match_ptr() macro in smc91x.c
ipv6: addrconf.c: remove unnecessary "if"
bridge: Correctly encode addresses when dumping mdb entries
bridge: Do not unregister all PF_BRIDGE rtnl operations
use generic usbnet_manage_power()
usbnet: generic manage_power()
usbnet: handle PM failure gracefully
ksz884x: fix receive polling race condition
qlcnic: update driver version
qlcnic: fix unused variable warnings
net: fec: forbid FEC_PTP on SoCs that do not support
be2net: fix wrong frag_idx reported by RX CQ
be2net: fix be_close() to ensure all events are ack'ed
...
2012-12-19 20:29:15 -08:00
Bluetooth: trivial: Change NO_FCS_RECV to RECV_NO_FCS
2012-12-03 16:00:01 -02:00
caif-hsi: Remove use of module parameters
2012-06-25 16:44:12 -07:00
various: Fix spelling of "registered" in comments.
2012-11-19 14:29:46 +01:00
netfilter: nf_nat: Handle routing changes in MASQUERADE target
2012-12-03 15:14:20 +01:00
sctp: Make hmac algorithm selection for cookie generation dynamic
2012-10-26 02:22:18 -04:00
NFC: Export nfc_hci_sak_to_protocol()
2012-11-19 23:56:59 +01:00
net: remove my future former mail address
2012-06-17 16:29:38 -07:00
sctp: Add RCU protection to assoc->transport_addr_list
2012-12-07 14:15:04 -05:00
netconf: advertise mc_forwarding status
2012-12-04 13:08:10 -05:00
unix: Remove unused field from unix_sock
2012-10-21 20:37:06 -04:00
net: Dont use ifindices in hash fns
2012-08-09 16:18:06 -07:00
userns: Convert net/ax25 to use kuid_t where appropriate
2012-08-14 21:49:42 -07:00
cfg80211: fix BSS struct IE access races
2012-11-30 13:42:20 +01:00
net: core: add function for incremental IPv6 pseudo header checksum updates
2012-08-30 03:00:16 +02:00
cipso: handle CIPSO options correctly when NetLabel is disabled
2012-06-01 14:18:29 -04:00
net: Update args to dummy sock_update_classid().
2012-10-26 05:07:00 -04:00
codel: refine one condition to avoid a nul rec_inv_sqrt
2012-08-10 16:52:54 -07:00
decnet: Use neighbours privately in dn_route struct.
2012-07-05 01:12:14 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-08-22 14:21:38 -07:00
net: Fix warnings in dst_ops.h
2012-07-19 10:43:03 -07:00
ipv4: Elide fib_validate_source() completely when possible.
2012-06-29 01:36:36 -07:00
ipv4: Add FLOWI_FLAG_KNOWN_NH
2012-10-08 17:42:36 -04:00
netlink: Rename pid to portid to avoid confusion
2012-09-10 15:30:41 -04:00
net: fix a race in gro_cell_poll()
2012-12-11 12:49:53 -05:00
mac80211: support (partial) VHT radiotap information
2012-11-27 11:56:18 +01: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
ipv6: Add helper inet6_csk_update_pmtu().
2012-07-16 03:44:56 -07:00
ipv6: Early TCP socket demux
2012-07-26 15:50:39 -07:00
net-tcp: Fast Open client - sendmsg(MSG_FASTOPEN)
2012-07-19 11:02:03 -07:00
inet: Fix kmemleak in tcp_v4/6_syn_recv_sock and dccp_v4/6_request_recv_sock
2012-12-14 13:14:07 -05:00
tunnel: drop packet if ECN present with not-ECT
2012-09-27 18:12:37 -04:00
ipv6: unify fragment thresh handling code
2012-09-19 17:23:28 -04:00
net: fix sparse endianness warnings on sock_common
2012-12-02 20:23:01 -05:00
net: move inet_dport/inet_num in sock_common
2012-11-30 15:02:56 -05:00
net: move inet_dport/inet_num in sock_common
2012-11-30 15:02:56 -05:00
ipv4: Maintain redirect and PMTU info in struct rtable again.
2012-07-10 22:40:14 -07:00
ipv4: fix path MTU discovery with connection tracking
2012-08-26 19:13:55 +02:00
ipv6: Separate tcp offload functionality
2012-11-15 17:36:18 -05:00
ipv6: remove rt6i_peer_genid from rt6_info and its handler
2012-11-08 21:16:08 -05:00
ipv6: export IP6_RT_PRIO_* to userland
2012-11-16 01:47:40 -05:00
gre: Support GRE over IPv6
2012-08-14 14:28:32 -07:00
ipv4: add a fib_type to fib_info
2012-10-04 13:58:26 -04:00
ipvs: fix build errors related to config option combinations
2012-10-23 09:23:40 +09:00
net: convert __IPTUNNEL_XMIT() to an inline function
2012-11-14 18:49:50 -05:00
ipv6: unify logic evaluating inet6_dev's accept_ra property
2012-12-01 11:36:37 -05:00
lapb: Neaten debugging
2012-05-17 18:45:20 -04:00
llc: Remove stray reference to sysctl_llc_station_ack_timeout.
2012-09-17 13:13:24 -04:00
net: delete all instances of special processing for token ring
2012-05-15 20:14:35 -04:00
mac80211: introduce IEEE80211_HW_TEARDOWN_AGGR_ON_BAR_FAIL
2012-12-05 09:53:31 +01:00
mac802154: add wpan device-class support
2012-06-26 21:06:11 -07:00
ipv6: Change skb->data before using icmpv6_notify() to propagate redirect
2012-12-14 13:14:07 -05:00
net: output path optimizations
2012-08-07 16:24:55 -07:00
proc: Usable inode numbers for the namespace file descriptors.
2012-11-20 04:19:49 -08:00
net: Pass neighbours and dest address into NETEVENT_REDIRECT events.
2012-07-05 02:21:55 -07:00
userns: Convert the audit loginuid to be a kuid
2012-09-17 18:08:54 -07:00
netlink: Rename pid to portid to avoid confusion
2012-09-10 15:30:41 -04:00
netprio_cgroup: use cgroup->id instead of cgroup_netprio_state->prioidx
2012-11-22 07:32:47 -08:00
net: Remove code duplication between offload structures
2012-11-15 17:39:51 -05:00
ipv6: bool/const conversions phase2
2012-05-19 01:08:16 -04:00
cfg80211: add cellular base station regulatory hint support
2012-07-17 12:16:39 +02:00
tcp: better retrans tracking for defer-accept
2012-11-03 14:45:00 -04:00
ipv4: avoid a test in ip_rt_put()
2012-11-03 14:59:04 -04:00
rtnelink: remove unused parameter from rtnl_create_link().
2012-11-30 12:24:40 -05:00
pkt_sched: avoid requeues if possible
2012-12-12 00:16:47 -05:00
net: Remove unnecessary NULL check in scm_destroy().
2012-09-24 15:52:33 -04:00
net: avoid reloads in SNMP_UPD_PO_STATS
2012-08-06 13:40:47 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-12-13 12:00:02 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2012-12-12 18:07:07 -08:00
[PATCH] tcp: Cache inetpeer in timewait socket, and only when necessary.
2012-06-09 14:56:12 -07:00
mac802154: monitor device support
2012-05-16 15:17:08 -04:00
xfrm: Fix the gc threshold value for ipv4
2012-11-13 09:15:07 +01:00
9eb127cc04