Linus Torvalds
be9c6d9169
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...
Pull networking fixes from David Miller:
"Just a bunch of small fixes and tidy ups:
1) Finish the "busy_poll" renames, from Eliezer Tamir.
2) Fix RCU stalls in IFB driver, from Ding Tianhong.
3) Linearize buffers properly in tun/macvtap zerocopy code.
4) Don't crash on rmmod in vxlan, from Pravin B Shelar.
5) Spinlock used before init in alx driver, from Maarten Lankhorst.
6) A sparse warning fix in bnx2x broke TSO checksums, fix from Dmitry
Kravkov.
7) Dummy and ifb driver load failure paths can oops, fixes from Tan
Xiaojun and Ding Tianhong.
8) Correct MTU calculations in IP tunnels, from Alexander Duyck.
9) Account all TCP retransmits in SNMP stats properly, from Yuchung
Cheng.
10) atl1e and via-rhine do not handle DMA mapping failures properly,
from Neil Horman.
11) Various equal-cost multipath route fixes in ipv6 from Hannes
Frederic Sowa"
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (36 commits)
ipv6: only static routes qualify for equal cost multipathing
via-rhine: fix dma mapping errors
atl1e: fix dma mapping warnings
tcp: account all retransmit failures
usb/net/r815x: fix cast to restricted __le32
usb/net/r8152: fix integer overflow in expression
net: access page->private by using page_private
net: strict_strtoul is obsolete, use kstrtoul instead
drivers/net/ieee802154: don't use devm_pinctrl_get_select_default() in probe
drivers/net/ethernet/cadence: don't use devm_pinctrl_get_select_default() in probe
drivers/net/can/c_can: don't use devm_pinctrl_get_select_default() in probe
net/usb: add relative mii functions for r815x
net/tipc: use %*phC to dump small buffers in hex form
qlcnic: Adding Maintainers.
gre: Fix MTU sizing check for gretap tunnels
pkt_sched: sch_qfq: remove forward declaration of qfq_update_agg_ts
pkt_sched: sch_qfq: improve efficiency of make_eligible
gso: Update tunnel segmentation to support Tx checksum offload
inet: fix spacing in assignment
ifb: fix oops when loading the ifb failed
...
2013-07-13 17:42:22 -07:00
9P: Add cancelled() to the transport functions.
2013-07-07 22:18:18 -05:00
Bluetooth: Remove unneeded flag
2013-06-23 00:23:53 +01:00
caif: Remove my bouncing email address.
2013-04-23 13:25:51 -04:00
irda: small read past the end of array in debug code
2013-04-19 17:32:31 -04:00
af_iucv: fix recvmsg by replacing skb_pull() function
2013-04-08 17:16:57 -04:00
net_sched: add 64bit rate estimators
2013-06-11 02:51:03 -07:00
netfilter: {ipt,ebt}_ULOG: rise warning on deprecation
2013-05-23 14:23:16 +02:00
NFC: Add secure elements addition and removal API
2013-06-14 13:44:58 +02:00
net: sctp: prevent checksum.h from double inclusion
2013-07-02 00:23:57 -07:00
net_sched: add 64bit rate estimators
2013-06-11 02:51:03 -07:00
ipv6,mcast: always hold idev->lock before mca_lock
2013-07-01 23:39:21 -07:00
af_unix: fix a fatal race with bit fields
2013-05-01 15:13:49 -04:00
net: Dont use ifindices in hash fns
2012-08-09 16:18:06 -07:00
hlist: drop the node parameter from iterators
2013-02-27 19:10:24 -08:00
net: rename busy poll socket op and globals
2013-07-10 17:08:27 -07:00
cfg80211: require passing BSS struct back to cfg80211_assoc_timeout
2013-06-19 18:55:39 +02:00
net: core: add function for incremental IPv6 pseudo header checksum updates
2012-08-30 03:00:16 +02:00
cls_cgroup: remove task_struct parameter from sock_update_classid()
2013-04-09 13:19:35 -04:00
codel: refine one condition to avoid a nul rec_inv_sqrt
2012-08-10 16:52:54 -07:00
decnet: Parse netlink attributes on our own
2013-03-22 10:31:16 -04:00
decnet: use correct RCU API to deref sk_dst_cache field
2013-01-28 00:15:27 -05:00
ipv6: Optimize ipv6_change_dsfield().
2013-01-09 23:59:53 -08:00
Fix dst_neigh_lookup/dst_neigh_lookup_skb return value handling bug
2013-03-15 09:06:58 -04:00
firewire net, ipv4 arp: Extend hardware address and remove driver-level packet inspection.
2013-03-26 12:32:13 -04:00
ipv4: Add FLOWI_FLAG_KNOWN_NH
2012-10-08 17:42:36 -04:00
flow_keys: include thoff into flow_keys for later usage
2013-03-20 12:14:36 -04:00
net_sched: add 64bit rate estimators
2013-06-11 02:51:03 -07:00
genl: Allow concurrent genl callbacks.
2013-04-25 01:43:15 -04:00
net: gre: move GSO functions to gre_offload
2013-07-03 14:37:39 -07:00
gro: Fix kcalloc argument order
2013-01-27 22:46:33 -05:00
ipv4: fix error handling in icmp_protocol.
2013-02-22 15:10:18 -05:00
mac80211: add STBC flag for radiotap
2013-05-24 12:07:25 +02:00
ieee802154/nl-mac.c: make some MLME operations optional
2013-04-08 12:00:16 -04:00
ipv6: resend MLD report if a link-local address completes DAD
2013-06-28 21:19:17 -07:00
ipv6: use a stronger hash for tcp
2013-02-21 18:15:58 -05:00
tcp: Tail loss probe (TLP)
2013-03-12 08:30:34 -04:00
net: Correct comparisons and calculations using skb->tail and skb-transport_header
2013-05-28 23:49:07 -07:00
net: frag, fix race conditions in LRU list maintenance
2013-05-06 11:06:51 -04:00
hlist: drop the node parameter from iterators
2013-02-27 19:10:24 -08:00
ipv4: remove is_data also from ip_options documentation.
2013-06-12 03:13:50 -07:00
hlist: drop the node parameter from iterators
2013-02-27 19:10:24 -08:00
ipv4: Add a socket release callback for datagram sockets
2013-01-21 14:17:05 -05:00
ipv6: move csum_ipv6_magic() and udp6_csum_init() into static library
2013-01-08 17:56:10 -08:00
ipv6: fix race condition regarding dst->expires and dst->from.
2013-02-20 15:11:45 -05:00
ipv6: Remove unused neigh argument for icmp6_dst_alloc() and its callers.
2013-01-18 14:41:13 -05:00
GRE: Refactor GRE tunneling code.
2013-03-26 12:27:18 -04:00
ipv4: remove fib_update_nh_saddrs() declaration.
2013-07-02 00:33:52 -07:00
sit: add support of x-netns
2013-06-27 22:30:47 -07:00
ipvs: add sync_persist_mode flag
2013-06-26 18:01:46 +09:00
ipv6: Convert use of typedef ctl_table to struct ctl_table
2013-06-19 23:18:07 -07:00
hostap: Don't use create_proc_read_entry()
2013-04-29 15:41:56 -04:00
llc: Remove stray reference to sysctl_llc_station_ack_timeout.
2012-09-17 13:13:24 -04:00
mac80211: track AP's beacon rate and give it to the driver
2013-06-13 11:58:47 +02:00
net/802: Implement Multiple Registration Protocol (MRP)
2013-02-10 20:37:22 -05:00
ndisc: Convert use of typedef ctl_table to struct ctl_table
2013-06-19 23:18:07 -07:00
net neighbour, decnet: Ensure to align device private data on preferred alignment.
2013-02-11 00:21:44 -05:00
netns: exclude ipvs from struct net when IPVS disabled
2013-06-26 18:01:46 +09:00
ipv6 netevent: Remove old_neigh from netevent_redirect.
2013-01-14 15:04:59 -05: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: remove task_struct parameter from sock_update_netprio()
2013-04-09 13:19:37 -04:00
hlist: drop the node parameter from iterators
2013-02-27 19:10:24 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2013-06-05 16:37:30 -07:00
pkt_sched: namespace aware act_mirred
2013-01-14 15:09:36 -05:00
sch_api: introduce qdisc_watchdog_schedule_ns()
2013-02-12 18:59:45 -05:00
net: Remove code duplication between offload structures
2012-11-15 17:39:51 -05:00
regulatory: use RCU to protect last_request
2013-01-03 13:01:30 +01:00
net: remove a stale comment for dl_next
2013-04-22 15:55:48 -04:00
ipv4: avoid a test in ip_rt_put()
2012-11-03 14:59:04 -04:00
rtnetlink: Remove passing of attributes into rtnl_doit functions
2013-03-22 10:31:16 -04:00
net_sched: psched_ratecfg_precompute() improvements
2013-06-11 22:39:47 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2013-04-22 20:32:51 -04:00
net: defer net_secret[] initialization
2013-04-29 15:14:02 -04:00
net: avoid reloads in SNMP_UPD_PO_STATS
2012-08-06 13:40:47 -07:00
net: sock: fix TCP_SKB_MIN_TRUESIZE
2013-07-03 16:52:10 -07:00
tcp: remove invalid __rcu annotation
2013-06-25 02:44:05 -07:00
transp_v6.h: style neatening
2013-06-04 16:43:42 -07:00
ipv6: call udp_push_pending_frames when uncorking a socket with AF_INET pending data
2013-07-02 12:44:18 -07:00
xfrm: force a garbage collection after deleting a policy
2013-05-31 17:30:07 -07:00
be9c6d9169