aboutsummaryrefslogtreecommitdiffstats
path: root/net/tipc/bearer.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-05-02 19:40:27 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2017-05-02 19:40:27 -0400
commit8d65b08debc7e62b2c6032d7fe7389d895b92cbc (patch)
tree0c3141b60c3a03cc32742b5750c5e763b9dae489 /net/tipc/bearer.c
parent5a0387a8a8efb90ae7fea1e2e5c62de3efa74691 (diff)
parent5d15af6778b8e4ed1fd41b040283af278e7a9a72 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
Pull networking updates from David Millar: "Here are some highlights from the 2065 networking commits that happened this development cycle: 1) XDP support for IXGBE (John Fastabend) and thunderx (Sunil Kowuri) 2) Add a generic XDP driver, so that anyone can test XDP even if they lack a networking device whose driver has explicit XDP support (me). 3) Sparc64 now has an eBPF JIT too (me) 4) Add a BPF program testing framework via BPF_PROG_TEST_RUN (Alexei Starovoitov) 5) Make netfitler network namespace teardown less expensive (Florian Westphal) 6) Add symmetric hashing support to nft_hash (Laura Garcia Liebana) 7) Implement NAPI and GRO in netvsc driver (Stephen Hemminger) 8) Support TC flower offload statistics in mlxsw (Arkadi Sharshevsky) 9) Multiqueue support in stmmac driver (Joao Pinto) 10) Remove TCP timewait recycling, it never really could possibly work well in the real world and timestamp randomization really zaps any hint of usability this feature had (Soheil Hassas Yeganeh) 11) Support level3 vs level4 ECMP route hashing in ipv4 (Nikolay Aleksandrov) 12) Add socket busy poll support to epoll (Sridhar Samudrala) 13) Netlink extended ACK support (Johannes Berg, Pablo Neira Ayuso, and several others) 14) IPSEC hw offload infrastructure (Steffen Klassert)" * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (2065 commits) tipc: refactor function tipc_sk_recv_stream() tipc: refactor function tipc_sk_recvmsg() net: thunderx: Optimize page recycling for XDP net: thunderx: Support for XDP header adjustment net: thunderx: Add support for XDP_TX net: thunderx: Add support for XDP_DROP net: thunderx: Add basic XDP support net: thunderx: Cleanup receive buffer allocation net: thunderx: Optimize CQE_TX handling net: thunderx: Optimize RBDR descriptor handling net: thunderx: Support for page recycling ipx: call ipxitf_put() in ioctl error path net: sched: add helpers to handle extended actions qed*: Fix issues in the ptp filter config implementation. qede: Fix concurrency issue in PTP Tx path processing. stmmac: Add support for SIMATIC IOT2000 platform net: hns: fix ethtool_get_strings overflow in hns driver tcp: fix wraparound issue in tcp_lp bpf, arm64: fix jit branch offset related to ldimm64 bpf, arm64: implement jiting of BPF_XADD ...
Diffstat (limited to 'net/tipc/bearer.c')
-rw-r--r--net/tipc/bearer.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/net/tipc/bearer.c b/net/tipc/bearer.c
index 33a5bdfbef76..d174ee3254ee 100644
--- a/net/tipc/bearer.c
+++ b/net/tipc/bearer.c
@@ -802,7 +802,7 @@ int tipc_nl_bearer_get(struct sk_buff *skb, struct genl_info *info)
802 802
803 err = nla_parse_nested(attrs, TIPC_NLA_BEARER_MAX, 803 err = nla_parse_nested(attrs, TIPC_NLA_BEARER_MAX,
804 info->attrs[TIPC_NLA_BEARER], 804 info->attrs[TIPC_NLA_BEARER],
805 tipc_nl_bearer_policy); 805 tipc_nl_bearer_policy, info->extack);
806 if (err) 806 if (err)
807 return err; 807 return err;
808 808
@@ -851,7 +851,7 @@ int tipc_nl_bearer_disable(struct sk_buff *skb, struct genl_info *info)
851 851
852 err = nla_parse_nested(attrs, TIPC_NLA_BEARER_MAX, 852 err = nla_parse_nested(attrs, TIPC_NLA_BEARER_MAX,
853 info->attrs[TIPC_NLA_BEARER], 853 info->attrs[TIPC_NLA_BEARER],
854 tipc_nl_bearer_policy); 854 tipc_nl_bearer_policy, info->extack);
855 if (err) 855 if (err)
856 return err; 856 return err;
857 857
@@ -891,7 +891,7 @@ int tipc_nl_bearer_enable(struct sk_buff *skb, struct genl_info *info)
891 891
892 err = nla_parse_nested(attrs, TIPC_NLA_BEARER_MAX, 892 err = nla_parse_nested(attrs, TIPC_NLA_BEARER_MAX,
893 info->attrs[TIPC_NLA_BEARER], 893 info->attrs[TIPC_NLA_BEARER],
894 tipc_nl_bearer_policy); 894 tipc_nl_bearer_policy, info->extack);
895 if (err) 895 if (err)
896 return err; 896 return err;
897 897
@@ -939,7 +939,7 @@ int tipc_nl_bearer_add(struct sk_buff *skb, struct genl_info *info)
939 939
940 err = nla_parse_nested(attrs, TIPC_NLA_BEARER_MAX, 940 err = nla_parse_nested(attrs, TIPC_NLA_BEARER_MAX,
941 info->attrs[TIPC_NLA_BEARER], 941 info->attrs[TIPC_NLA_BEARER],
942 tipc_nl_bearer_policy); 942 tipc_nl_bearer_policy, info->extack);
943 if (err) 943 if (err)
944 return err; 944 return err;
945 945
@@ -982,7 +982,7 @@ int tipc_nl_bearer_set(struct sk_buff *skb, struct genl_info *info)
982 982
983 err = nla_parse_nested(attrs, TIPC_NLA_BEARER_MAX, 983 err = nla_parse_nested(attrs, TIPC_NLA_BEARER_MAX,
984 info->attrs[TIPC_NLA_BEARER], 984 info->attrs[TIPC_NLA_BEARER],
985 tipc_nl_bearer_policy); 985 tipc_nl_bearer_policy, info->extack);
986 if (err) 986 if (err)
987 return err; 987 return err;
988 988
@@ -1104,7 +1104,7 @@ int tipc_nl_media_get(struct sk_buff *skb, struct genl_info *info)
1104 1104
1105 err = nla_parse_nested(attrs, TIPC_NLA_MEDIA_MAX, 1105 err = nla_parse_nested(attrs, TIPC_NLA_MEDIA_MAX,
1106 info->attrs[TIPC_NLA_MEDIA], 1106 info->attrs[TIPC_NLA_MEDIA],
1107 tipc_nl_media_policy); 1107 tipc_nl_media_policy, info->extack);
1108 if (err) 1108 if (err)
1109 return err; 1109 return err;
1110 1110
@@ -1152,7 +1152,7 @@ int tipc_nl_media_set(struct sk_buff *skb, struct genl_info *info)
1152 1152
1153 err = nla_parse_nested(attrs, TIPC_NLA_MEDIA_MAX, 1153 err = nla_parse_nested(attrs, TIPC_NLA_MEDIA_MAX,
1154 info->attrs[TIPC_NLA_MEDIA], 1154 info->attrs[TIPC_NLA_MEDIA],
1155 tipc_nl_media_policy); 1155 tipc_nl_media_policy, info->extack);
1156 1156
1157 if (!attrs[TIPC_NLA_MEDIA_NAME]) 1157 if (!attrs[TIPC_NLA_MEDIA_NAME])
1158 return -EINVAL; 1158 return -EINVAL;