History

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Pull networking fixes from David Miller: 1) Off by one in mt76 airtime calculation, from Dan Carpenter. 2) Fix TLV fragment allocation loop condition in iwlwifi, from Luca Coelho. 3) Don't confirm neigh entries when doing ipsec pmtu updates, from Xu Wang. 4) More checks to make sure we only send TSO packets to lan78xx chips that they can actually handle. From James Hughes. 5) Fix ip_tunnel namespace move, from William Dauchy. 6) Fix unintended packet reordering due to cooperation between listification done by GRO and non-GRO paths. From Maxim Mikityanskiy. 7) Add Jakub Kicincki formally as networking co-maintainer. 8) Info leak in airo ioctls, from Michael Ellerman. 9) IFLA_MTU attribute needs validation during rtnl_create_link(), from Eric Dumazet. 10) Use after free during reload in mlxsw, from Ido Schimmel. 11) Dangling pointers are possible in tp->highest_sack, fix from Eric Dumazet. 12) Missing *pos++ in various networking seq_next handlers, from Vasily Averin. 13) CHELSIO_GET_MEM operation neds CAP_NET_ADMIN check, from Michael Ellerman. * git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (109 commits) firestream: fix memory leaks net: cxgb3_main: Add CAP_NET_ADMIN check to CHELSIO_GET_MEM net: bcmgenet: Use netif_tx_napi_add() for TX NAPI tipc: change maintainer email address net: stmmac: platform: fix probe for ACPI devices net/mlx5e: kTLS, Do not send decrypted-marked SKBs via non-accel path net/mlx5e: kTLS, Remove redundant posts in TX resync flow net/mlx5e: kTLS, Fix corner-case checks in TX resync flow net/mlx5e: Clear VF config when switching modes net/mlx5: DR, use non preemptible call to get the current cpu number net/mlx5: E-Switch, Prevent ingress rate configuration of uplink rep net/mlx5: DR, Enable counter on non-fwd-dest objects net/mlx5: Update the list of the PCI supported devices net/mlx5: Fix lowest FDB pool size net: Fix skb->csum update in inet_proto_csum_replace16(). netfilter: nf_tables: autoload modules from the abort path netfilter: nf_tables: add __nft_chain_type_get() netfilter: nf_tables_offload: fix check the chain offload flag netfilter: conntrack: sctp: use distinct states for new SCTP connections ipv6_route_seq_next should increase position index ...

Linus Torvalds committed 6 years ago

Commit 84809aa2 parents f041ead fa865ba118 files · +1469 −603Browse files

Showing the changes to include/linux (3 of 118 files). Show all

Unified · Split

3 files
  1. include/linux/netdevice.h +2 −0
  2. include/linux/netfilter/ipset/ip_set.h +0 −7
  3. include/linux/netfilter/nfnetlink.h +1 −1
include/linux/netdevice.h+2−0
@@ -3698,6 +3698,8 @@ int dev_set_alias(struct net_device *, const char *, size_t); · 3697 unmodified lines
3698int dev_get_alias(const struct net_device *, char *, size_t);3698int dev_get_alias(const struct net_device *, char *, size_t);
3699int dev_change_net_namespace(struct net_device *, struct net *, const char *);3699int dev_change_net_namespace(struct net_device *, struct net *, const char *);
3700int __dev_set_mtu(struct net_device *, int);3700int __dev_set_mtu(struct net_device *, int);
3701int dev_validate_mtu(struct net_device *dev, int mtu,
3702 struct netlink_ext_ack *extack);
3701int dev_set_mtu_ext(struct net_device *dev, int mtu,3703int dev_set_mtu_ext(struct net_device *dev, int mtu,
3702 struct netlink_ext_ack *extack);3704 struct netlink_ext_ack *extack);
3703int dev_set_mtu(struct net_device *, int);3705int dev_set_mtu(struct net_device *, int);
include/linux/netfilter/ipset/ip_set.h+0−7
@@ -426,13 +426,6 @@ ip6addrptr(const struct sk_buff *skb, bool src, struct in6_addr *addr) · 425 unmodified lines
426 sizeof(*addr));426 sizeof(*addr));
427}427}
428 428
429/* Calculate the bytes required to store the inclusive range of a-b */
430static inline int
431bitmap_bytes(u32 a, u32 b)
432{
433 return 4 * ((((b - a + 8) / 8) + 3) / 4);
434}
435
436/* How often should the gc be run by default */429/* How often should the gc be run by default */
437#define IPSET_GC_TIME (3 * 60)430#define IPSET_GC_TIME (3 * 60)
438 431
include/linux/netfilter/nfnetlink.h+1−1
@@ -31,7 +31,7 @@ struct nfnetlink_subsystem { · 30 unmodified lines
31 const struct nfnl_callback *cb; /* callback for individual types */31 const struct nfnl_callback *cb; /* callback for individual types */
32 struct module *owner;32 struct module *owner;
33 int (*commit)(struct net *net, struct sk_buff *skb);33 int (*commit)(struct net *net, struct sk_buff *skb);
34 int (*abort)(struct net *net, struct sk_buff *skb);34 int (*abort)(struct net *net, struct sk_buff *skb, bool autoload);
35 void (*cleanup)(struct net *net);35 void (*cleanup)(struct net *net);
36 bool (*valid_genid)(struct net *net, u32 genid);36 bool (*valid_genid)(struct net *net, u32 genid);
37};37};