David S. Miller
f9aa9dc7d2
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...
All conflicts were simple overlapping changes except perhaps
for the Thunder driver.
That driver has a change_mtu method explicitly for sending
a message to the hardware. If that fails it returns an
error.
Normally a driver doesn't need an ndo_change_mtu method becuase those
are usually just range changes, which are now handled generically.
But since this extra operation is needed in the Thunder driver, it has
to stay.
However, if the message send fails we have to restore the original
MTU before the change because the entire call chain expects that if
an error is thrown by ndo_change_mtu then the MTU did not change.
Therefore code is added to nicvf_change_mtu to remember the original
MTU, and to restore it upon nicvf_update_hw_max_frs() failue.
Signed-off-by: David S. Miller <davem@davemloft.net>
2016-11-22 13:27:16 -05:00
Bluetooth: Add support for appearance in scan rsp
2016-09-19 20:19:34 +02:00
netns: make struct pernet_operations::id unsigned int
2016-11-18 10:59:15 -05:00
netns: make struct pernet_operations::id unsigned int
2016-11-18 10:59:15 -05:00
NFC: digital: Add support for NFC DEP Response Waiting Time
2016-07-11 02:01:14 +02:00
sock: struct proto hash function may error
2016-02-11 03:54:14 -05:00
sctp: use new rhlist interface on sctp transport rhashtable
2016-11-16 23:22:17 -05:00
net/sched: act_tunnel_key: add helper inlines to access tcf_tunnel_key
2016-11-09 13:41:53 -05:00
6lowpan: add 802.15.4 short addr slaac
2016-06-15 20:41:22 -07:00
tc_act: Remove tcf_act macro
2016-11-09 21:14:05 -05:00
ipv6: fix a potential deadlock in do_ipv6_setsockopt()
2016-10-21 11:29:02 -04:00
rxrpc: Rewrite the data and ack handling code
2016-09-08 11:10:12 +01:00
af_unix: split 'u->readlock' into two: 'iolock' and 'bindlock'
2016-09-04 13:29:29 -07:00
VSOCK: Introduce virtio_vsock_common.ko
2016-08-02 02:57:29 +03:00
bonding: 3ad: apply ad_actor settings changes immediately
2016-02-09 04:45:49 -05:00
netns: make struct pernet_operations::id unsigned int
2016-11-18 10:59:15 -05:00
udp: enable busy polling for all sockets
2016-11-18 10:44:31 -05:00
calipso: Add a label cache.
2016-06-27 15:06:17 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-10-30 12:42:58 -04:00
ieee802154: add netns support
2016-07-08 12:20:57 +02:00
csum: Update csum_block_add to use rotate instead of byteswap
2016-03-13 15:01:00 -04:00
cls_cgroup: get sk_classid only from full sockets
2016-04-19 20:09:25 -04:00
codel: split into multiple files
2016-04-25 16:44:27 -04:00
codel: split into multiple files
2016-04-25 16:44:27 -04:00
net_sched: fq_codel: cache skb->truesize into skb->cb
2016-06-25 12:19:35 -04:00
packet: compat support for sock_fprog
2016-06-09 23:41:03 -07:00
devlink: remove unused priv_size
2016-08-26 11:55:18 -07:00
net: dsa: add port fast ageing
2016-09-23 08:38:50 -04:00
route: move lwtunnel state to a single place
2016-04-25 16:20:09 -04:00
net: add dst_cache support
2016-02-16 20:21:48 -05:00
net/dst: Add dst port to dst_metadata utility functions
2016-11-09 13:41:54 -05:00
net: core: add UID to flows, rules, and routes
2016-11-04 14:45:23 -04:00
net: inet: Support UID-based routing in IP protocols.
2016-11-04 14:45:23 -04:00
net/sched: cls_flower: Add UDP port to tunnel parameters
2016-11-09 13:41:54 -05:00
fou: Add encap ops for IPv6 tunnels
2016-05-20 18:03:16 -04:00
fq.h: Port memory limit mechanism from fq_codel
2016-09-30 13:29:21 +02:00
fq.h: Port memory limit mechanism from fq_codel
2016-09-30 13:29:21 +02:00
net: sched: do not acquire qdisc spinlock in qdisc/class stats dump
2016-06-07 16:37:14 -07:00
genetlink: Make family a signed integer.
2016-11-13 12:14:59 -05:00
net: Remove deprecated tunnel specific UDP offload functions
2016-06-17 20:23:32 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-08-18 01:17:32 -04:00
gro_cells: mark napi struct as not busy poll candidates
2016-11-15 22:27:27 -05:00
gtp: #define #define _GTP_H_ and not #define _GTP_H
2016-07-25 17:55:43 -07:00
net: add a hardware buffer management helper API
2016-03-14 12:19:46 -04:00
net: snmp: kill STATS_BH macros
2016-04-27 22:48:25 -04:00
wireless: radiotap: fix timestamp sampling position values
2016-10-19 12:11:36 +02:00
mac802154: constify ieee802154_llsec_ops structure
2016-01-04 20:40:41 +01:00
IPv6: fix DESYNC_FACTOR
2016-10-14 10:59:15 -04:00
ila: Add generic ILA translation facility
2015-12-15 23:25:20 -05:00
ipv6: remove unused in6_addr struct
2016-03-22 15:45:44 -04:00
tcp/dccp: do not touch listener sk_refcnt under synflood
2016-04-04 22:11:20 -04:00
ip4ip6: Support for GSO/GRO
2016-05-20 18:03:17 -04:00
tcp/dccp: drop SYN packets if accept queue is full
2016-10-29 15:09:21 -04:00
ipv6: suppress sparse warnings in IP6_ECN_set_ce()
2016-08-13 15:08:00 -07:00
ipv4: namespacify ip fragment max dist sysctl knob
2016-02-16 20:42:54 -05:00
tcp/dccp: do not touch listener sk_refcnt under synflood
2016-04-04 22:11:20 -04:00
ipv4: add IP_RECVFRAGSIZE cmsg
2016-11-03 15:41:11 -04:00
inet: tcp: fix inetpeer_set_addr_v4()
2015-12-16 00:14:12 -05:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-11-15 10:54:36 -05:00
ipv6: Pass proto to csum_ipv6_magic as __u8 instead of unsigned short
2016-03-13 23:55:13 -04:00
net: ipv6: Fix processing of RAs in presence of VRF
2016-10-27 16:30:52 -04:00
net: inet: Support UID-based routing in IP protocols.
2016-11-04 14:45:23 -04:00
ip6_tunnel: Clear IP6CB in ip6tunnel_xmit()
2016-11-02 15:18:36 -04:00
ipv4: Restore fib_trie_flush_external function and fix call ordering
2016-11-16 13:24:50 -05:00
netns: make struct pernet_operations::id unsigned int
2016-11-18 10:59:15 -05:00
ipvs: update real-server binding of outgoing connections in SIP-pe
2016-06-06 09:47:25 +09:00
ipv6: add source address argument for ipv6_push_nfrag_opts
2016-11-09 20:40:06 -05:00
cfg80211/wext: fix message ordering
2016-01-29 17:13:43 +01:00
kcm: Use stream parser
2016-08-17 19:36:23 -04:00
net: ipv4: Do not drop to make_route if oif is l3mdev
2016-10-13 12:05:26 -04:00
lwtunnel: subtract tunnel headroom from mtu on output redirect
2016-11-16 17:01:15 -05:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-10-30 12:42:58 -04:00
ieee802154: cleanup WARN_ON for fc fetch
2016-07-08 13:23:12 +02:00
openvswitch: use mpls_hdr
2016-10-03 02:00:22 -04:00
net/ncsi: Introduce ncsi_stop_dev()
2016-10-04 02:11:51 -04:00
6lowpan: introduce 6lowpan-nd
2016-06-15 20:41:23 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-11-22 13:27:16 -05:00
neigh: Send a notification when DELAY_PROBE_TIME changes
2016-07-05 09:06:29 -07:00
netlabel: Implement CALIPSO config functions for SMACK.
2016-06-27 15:06:18 -04:00
netlink: use "unsigned int" in nla_next()
2016-11-19 22:11:25 -05:00
net: wrap sock->sk_cgrp_prioidx and ->sk_classid inside a struct
2015-12-08 22:02:33 -05:00
ieee802154: add netns support
2016-07-08 12:20:57 +02:00
net: ping: make ping_v6_sendmsg static
2016-03-23 22:09:58 -04:00
net/sched: pkt_cls: change tc actions order to be as the user sets
2016-09-28 05:02:44 -04:00
net: make default TX queue length a defined constant
2016-11-07 20:15:55 -05:00
pptp: Refactor the struct and macros of PPTP codes
2016-08-15 10:55:53 -07:00
udp: Remove udp_offloads
2016-04-07 16:53:30 -04:00
net: ip, diag -- Add diag interface for raw sockets
2016-10-23 19:35:24 -04:00
net: ip, diag -- Add diag interface for raw sockets
2016-10-23 19:35:24 -04:00
inet: reqsk_alloc() needs to take care of dead listeners
2016-04-04 22:11:19 -04:00
net: inet: Support UID-based routing in IP protocols.
2016-11-04 14:45:23 -04:00
net: rtnetlink: add support for the IFLA_STATS_LINK_XSTATS_SLAVE attribute
2016-06-30 06:15:04 -04:00
sched: add and use qdisc_skb_head helpers
2016-09-19 01:47:18 -04:00
unix: correctly track in-flight fds in sending process user_struct
2016-02-08 10:30:42 -05:00
ipv6: sr: add core files for SR HMAC support
2016-11-09 20:40:06 -05:00
ipv6: sr: add core files for SR HMAC support
2016-11-09 20:40:06 -05:00
net: snmp: fix 64bit stats on 32bit arches
2016-04-28 11:49:45 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-11-15 10:54:36 -05:00
soreuseport: fix NULL ptr dereference SO_REUSEPORT after bind
2016-01-19 14:44:23 -05:00
kcm: Remove TCP specific references from kcm and strparser
2016-08-28 23:32:41 -04:00
switchdev: remove FIB offload infrastructure
2016-09-28 04:48:00 -04:00
tcp: make undo_cwnd mandatory for congestion modules
2016-11-21 13:20:17 -05:00
ipv6: add new struct ipcm6_cookie
2016-05-03 16:08:14 -04:00
udplite: fix NULL pointer dereference
2016-11-15 11:59:38 -05:00
vxlan: Add new UDP encapsulation offload type for VXLAN-GPE
2016-06-17 20:23:32 -07:00
udplite: fix NULL pointer dereference
2016-11-15 11:59:38 -05:00
vxlan: remove unsed vxlan_dev_dst_port()
2016-11-15 12:16:13 -05:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-09-23 06:46:57 -04:00
f9aa9dc7d2