1) Revert regression inducing change to the IPSEC template resolver,
from Steffen Klassert.
2) Peeloffs can cause the wrong sk to be waken up in SCTP, fix from
Xin Long.
3) Min packet MTU size is wrong in cpsw driver, from Grygorii Strashko.
4) Fix build failure in netfilter ctnetlink, from Arnd Bergmann.
5) ISDN hisax driver checks pnp_irq() for errors incorrectly, from
Arvind Yadav.
6) Fix fealnx driver build failure on MIPS, from Huacai Chen.
7) Fix into leak in SCTP, the scope_id of socket addresses is not
always filled in. From Eric W. Biederman.
8) MTU inheritance between physical function and representor fix
in nfp driver, from Dirk van der Merwe.
9) Fix memory leak in rsi driver, from Colin Ian King.
10) Fix expiration and generation ID handling of cached ipv4
redirect routes, from Xin Long.
Please pull, thanks a lot!
The following changes since commit 6363b3f3ac5be096d08c8c504128befa0c033529:
Merge tag 'ipmi-for-4.15' of git://github.com/cminyard/linux-ipmi (2017-11-15 15:12:28 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git
for you to fetch changes up to 461ee7f3286dd50be4726606819c4228bc485a17:
net: usb: hso.c: remove unneeded DRIVER_LICENSE #define (2017-11-18 10:37:00 +0900)
----------------------------------------------------------------
Ahmed Abdelsalam (1):
ipv6: sr: update the struct ipv6_sr_hdr
Arnd Bergmann (1):
netfilter: add ifdef around ctnetlink_proto_size
Arvind Yadav (12):
isdn: hisax: Fix pnp_irq's error checking for setup_asuscom
isdn: hisax: Fix pnp_irq's error checking for avm_pnp_setup
isdn: hisax: Fix pnp_irq's error checking for setup_diva_isapnp
isdn: hisax: Fix pnp_irq's error checking for setup_elsa_isapnp
isdn: hisax: Fix pnp_irq's error checking for setup_hfcsx
isdn: hisax: Fix pnp_irq's error checking for setup_hfcs
isdn: hisax: Handle return value of pnp_irq and pnp_port_start
isdn: hisax: Fix pnp_irq's error checking for setup_isurf
isdn: hisax: Fix pnp_irq's error checking for setup_ix1micro
isdn: hisax: Fix pnp_irq's error checking for setup_niccy
isdn: hisax: Fix pnp_irq's error checking for setup_sedlbauer_isapnp
isdn: hisax: Fix pnp_irq's error checking for setup_teles3
Colin Ian King (2):
qed: use kzalloc instead of kmalloc and memset
rsi: fix memory leak on buf and usb_reg_buf
David S. Miller (3):
Merge branch 'isdn-hisax-Fix-pnp_irq-error-checking'
Merge branch 'master' of git://git.kernel.org/.../klassert/ipsec
Merge branch 'nfp-flower-fixes-and-typo-in-ethtool-stats-name'
Desnes Augusto Nunes do Rosario (1):
ibmvnic: fix dma_mapping_error call
Dirk van der Merwe (1):
nfp: inherit the max_mtu from the PF netdev
Eric W. Biederman (1):
net/sctp: Always set scope_id in sctp_inet6_skb_msgname
Girish Moodalbail (1):
ipvlan: NULL pointer dereference panic in ipvlan_port_destroy
Greg Kroah-Hartman (1):
net: usb: hso.c: remove unneeded DRIVER_LICENSE #define
Grygorii Strashko (1):
net: ethernet: ti: cpsw: fix min eth packet size
Herbert Xu (1):
xfrm: Copy policy family in clone_policy
Huacai Chen (1):
fealnx: Fix building error on MIPS
Joel Stanley (1):
virto_net: remove empty file 'virtio_net.'
John Hurley (2):
nfp: register flower reprs for egress dev offload
nfp: remove false positive offloads in flower vxlan
Jon Maloy (1):
tipc: enforce valid ratio between skb truesize and contents
Michal Kubecek (1):
genetlink: fix genlmsg_nlhdr()
Pieter Jansen van Vuuren (2):
nfp: fix flower offload metadata flag usage
nfp: fix vlan receive MAC statistics typo
Steffen Klassert (1):
Revert "xfrm: Fix stack-out-of-bounds read in xfrm_state_find."
Tim Hansen (1):
net/netlabel: Add list_next_rcu() in rcu_dereference().
Vitaly Kuznetsov (1):
hv_netvsc: preserve hw_features on mtu/channels/ringparam changes
Xin Long (6):
sctp: do not free asoc when it is already dead in sctp_sendmsg
sctp: use the right sk after waking up from wait_buf sleep
sctp: check stream reset info len before making reconf chunk
sctp: set frag_point in sctp_setsockopt_maxseg correctly
route: update fnhe_expires for redirect when the fnhe exists
route: also update fnhe_genid when updating a route cache
drivers/isdn/hisax/asuscom.c | 2 +-
drivers/isdn/hisax/avm_pci.c | 2 +-
drivers/isdn/hisax/diva.c | 2 +-
drivers/isdn/hisax/elsa.c | 2 +-
drivers/isdn/hisax/hfc_sx.c | 2 +-
drivers/isdn/hisax/hfcscard.c | 2 +-
drivers/isdn/hisax/hisax_fcpcipnp.c | 2 +
drivers/isdn/hisax/isurf.c | 2 +-
drivers/isdn/hisax/ix1_micro.c | 2 +-
drivers/isdn/hisax/niccy.c | 2 +-
drivers/isdn/hisax/sedlbauer.c | 2 +-
drivers/isdn/hisax/teles3.c | 2 +-
drivers/net/ethernet/fealnx.c | 6 +--
drivers/net/ethernet/ibm/ibmvnic.c | 3 +-
drivers/net/ethernet/netronome/nfp/flower/main.c | 18 ++++++++
drivers/net/ethernet/netronome/nfp/flower/main.h | 5 ++-
drivers/net/ethernet/netronome/nfp/flower/metadata.c | 7 +++-
drivers/net/ethernet/netronome/nfp/flower/offload.c | 36 +++++++++++++---
drivers/net/ethernet/netronome/nfp/nfp_app.h | 20 +++++++++
drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c | 2 +-
drivers/net/ethernet/netronome/nfp/nfp_net_repr.c | 11 ++++-
drivers/net/ethernet/netronome/nfp/nfp_port.h | 2 +-
drivers/net/ethernet/qlogic/qed/qed_dcbx.c | 3 +-
drivers/net/ethernet/ti/cpsw.c | 4 +-
drivers/net/hyperv/hyperv_net.h | 4 ++
drivers/net/hyperv/netvsc_drv.c | 2 +-
drivers/net/hyperv/rndis_filter.c | 136 ++++++++++++++++++++++++++++++++++--------------------------
drivers/net/ipvlan/ipvlan_main.c | 104 ++++++++++++++++++++++++----------------------
drivers/net/macsec.c | 2 +-
drivers/net/usb/hso.c | 3 +-
drivers/net/virtio_net. | 0
drivers/net/wireless/mac80211_hwsim.c | 2 +-
drivers/net/wireless/rsi/rsi_91x_usb.c | 12 +++---
include/net/genetlink.h | 11 ++---
include/net/sctp/sctp.h | 3 +-
include/uapi/linux/seg6.h | 4 +-
net/ipv4/route.c | 14 ++++---
net/netfilter/nf_conntrack_netlink.c | 2 +
net/netlabel/netlabel_addrlist.h | 4 +-
net/nfc/netlink.c | 6 +--
net/sctp/ipv6.c | 5 ++-
net/sctp/sm_make_chunk.c | 2 +-
net/sctp/socket.c | 67 ++++++++++++++++++++----------
net/sctp/stream.c | 32 ++++++++++----
net/tipc/msg.c | 24 +++++++----
net/tipc/msg.h | 7 +++-
net/tipc/node.c | 2 +-
net/wireless/nl80211.c | 4 +-
net/xfrm/xfrm_policy.c | 30 +++++++++-----
49 files changed, 395 insertions(+), 228 deletions(-)
delete mode 100644 drivers/net/virtio_net.
1) Revert regression inducing change to the IPSEC template resolver, from Steffen Klassert. 2) Peeloffs can cause the wrong sk to be waken up in SCTP, fix from Xin Long. 3) Min packet MTU size is wrong in cpsw driver, from Grygorii Strashko. 4) Fix build failure in netfilter ctnetlink, from Arnd Bergmann. 5) ISDN hisax driver checks pnp_irq() for errors incorrectly, from Arvind Yadav. 6) Fix fealnx driver build failure on MIPS, from Huacai Chen. 7) Fix into leak in SCTP, the scope_id of socket addresses is not always filled in. From Eric W. Biederman. 8) MTU inheritance between physical function and representor fix in nfp driver, from Dirk van der Merwe. 9) Fix memory leak in rsi driver, from Colin Ian King. 10) Fix expiration and generation ID handling of cached ipv4 redirect routes, from Xin Long. Please pull, thanks a lot! The following changes since commit 6363b3f3ac5be096d08c8c504128befa0c033529: Merge tag 'ipmi-for-4.15' of git://github.com/cminyard/linux-ipmi (2017-11-15 15:12:28 -0800) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git for you to fetch changes up to 461ee7f3286dd50be4726606819c4228bc485a17: net: usb: hso.c: remove unneeded DRIVER_LICENSE #define (2017-11-18 10:37:00 +0900) ---------------------------------------------------------------- Ahmed Abdelsalam (1): ipv6: sr: update the struct ipv6_sr_hdr Arnd Bergmann (1): netfilter: add ifdef around ctnetlink_proto_size Arvind Yadav (12): isdn: hisax: Fix pnp_irq's error checking for setup_asuscom isdn: hisax: Fix pnp_irq's error checking for avm_pnp_setup isdn: hisax: Fix pnp_irq's error checking for setup_diva_isapnp isdn: hisax: Fix pnp_irq's error checking for setup_elsa_isapnp isdn: hisax: Fix pnp_irq's error checking for setup_hfcsx isdn: hisax: Fix pnp_irq's error checking for setup_hfcs isdn: hisax: Handle return value of pnp_irq and pnp_port_start isdn: hisax: Fix pnp_irq's error checking for setup_isurf isdn: hisax: Fix pnp_irq's error checking for setup_ix1micro isdn: hisax: Fix pnp_irq's error checking for setup_niccy isdn: hisax: Fix pnp_irq's error checking for setup_sedlbauer_isapnp isdn: hisax: Fix pnp_irq's error checking for setup_teles3 Colin Ian King (2): qed: use kzalloc instead of kmalloc and memset rsi: fix memory leak on buf and usb_reg_buf David S. Miller (3): Merge branch 'isdn-hisax-Fix-pnp_irq-error-checking' Merge branch 'master' of git://git.kernel.org/.../klassert/ipsec Merge branch 'nfp-flower-fixes-and-typo-in-ethtool-stats-name' Desnes Augusto Nunes do Rosario (1): ibmvnic: fix dma_mapping_error call Dirk van der Merwe (1): nfp: inherit the max_mtu from the PF netdev Eric W. Biederman (1): net/sctp: Always set scope_id in sctp_inet6_skb_msgname Girish Moodalbail (1): ipvlan: NULL pointer dereference panic in ipvlan_port_destroy Greg Kroah-Hartman (1): net: usb: hso.c: remove unneeded DRIVER_LICENSE #define Grygorii Strashko (1): net: ethernet: ti: cpsw: fix min eth packet size Herbert Xu (1): xfrm: Copy policy family in clone_policy Huacai Chen (1): fealnx: Fix building error on MIPS Joel Stanley (1): virto_net: remove empty file 'virtio_net.' John Hurley (2): nfp: register flower reprs for egress dev offload nfp: remove false positive offloads in flower vxlan Jon Maloy (1): tipc: enforce valid ratio between skb truesize and contents Michal Kubecek (1): genetlink: fix genlmsg_nlhdr() Pieter Jansen van Vuuren (2): nfp: fix flower offload metadata flag usage nfp: fix vlan receive MAC statistics typo Steffen Klassert (1): Revert "xfrm: Fix stack-out-of-bounds read in xfrm_state_find." Tim Hansen (1): net/netlabel: Add list_next_rcu() in rcu_dereference(). Vitaly Kuznetsov (1): hv_netvsc: preserve hw_features on mtu/channels/ringparam changes Xin Long (6): sctp: do not free asoc when it is already dead in sctp_sendmsg sctp: use the right sk after waking up from wait_buf sleep sctp: check stream reset info len before making reconf chunk sctp: set frag_point in sctp_setsockopt_maxseg correctly route: update fnhe_expires for redirect when the fnhe exists route: also update fnhe_genid when updating a route cache drivers/isdn/hisax/asuscom.c | 2 +- drivers/isdn/hisax/avm_pci.c | 2 +- drivers/isdn/hisax/diva.c | 2 +- drivers/isdn/hisax/elsa.c | 2 +- drivers/isdn/hisax/hfc_sx.c | 2 +- drivers/isdn/hisax/hfcscard.c | 2 +- drivers/isdn/hisax/hisax_fcpcipnp.c | 2 + drivers/isdn/hisax/isurf.c | 2 +- drivers/isdn/hisax/ix1_micro.c | 2 +- drivers/isdn/hisax/niccy.c | 2 +- drivers/isdn/hisax/sedlbauer.c | 2 +- drivers/isdn/hisax/teles3.c | 2 +- drivers/net/ethernet/fealnx.c | 6 +-- drivers/net/ethernet/ibm/ibmvnic.c | 3 +- drivers/net/ethernet/netronome/nfp/flower/main.c | 18 ++++++++ drivers/net/ethernet/netronome/nfp/flower/main.h | 5 ++- drivers/net/ethernet/netronome/nfp/flower/metadata.c | 7 +++- drivers/net/ethernet/netronome/nfp/flower/offload.c | 36 +++++++++++++--- drivers/net/ethernet/netronome/nfp/nfp_app.h | 20 +++++++++ drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c | 2 +- drivers/net/ethernet/netronome/nfp/nfp_net_repr.c | 11 ++++- drivers/net/ethernet/netronome/nfp/nfp_port.h | 2 +- drivers/net/ethernet/qlogic/qed/qed_dcbx.c | 3 +- drivers/net/ethernet/ti/cpsw.c | 4 +- drivers/net/hyperv/hyperv_net.h | 4 ++ drivers/net/hyperv/netvsc_drv.c | 2 +- drivers/net/hyperv/rndis_filter.c | 136 ++++++++++++++++++++++++++++++++++-------------------------- drivers/net/ipvlan/ipvlan_main.c | 104 ++++++++++++++++++++++++---------------------- drivers/net/macsec.c | 2 +- drivers/net/usb/hso.c | 3 +- drivers/net/virtio_net. | 0 drivers/net/wireless/mac80211_hwsim.c | 2 +- drivers/net/wireless/rsi/rsi_91x_usb.c | 12 +++--- include/net/genetlink.h | 11 ++--- include/net/sctp/sctp.h | 3 +- include/uapi/linux/seg6.h | 4 +- net/ipv4/route.c | 14 ++++--- net/netfilter/nf_conntrack_netlink.c | 2 + net/netlabel/netlabel_addrlist.h | 4 +- net/nfc/netlink.c | 6 +-- net/sctp/ipv6.c | 5 ++- net/sctp/sm_make_chunk.c | 2 +- net/sctp/socket.c | 67 ++++++++++++++++++++---------- net/sctp/stream.c | 32 ++++++++++---- net/tipc/msg.c | 24 +++++++---- net/tipc/msg.h | 7 +++- net/tipc/node.c | 2 +- net/wireless/nl80211.c | 4 +- net/xfrm/xfrm_policy.c | 30 +++++++++----- 49 files changed, 395 insertions(+), 228 deletions(-) delete mode 100644 drivers/net/virtio_net.