mirror of
https://github.com/lkl/linux.git
synced 2025-12-19 16:13:19 +09:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Conflicts: tools/testing/selftests/net/config62199e3f16("selftests: net: Add VXLAN MDB test")3a0385be13("selftests: add the missing CONFIG_IP_SCTP in net config") Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
@@ -25,7 +25,8 @@ void rtmsg_ifinfo_newnet(int type, struct net_device *dev, unsigned int change,
|
||||
struct sk_buff *rtmsg_ifinfo_build_skb(int type, struct net_device *dev,
|
||||
unsigned change, u32 event,
|
||||
gfp_t flags, int *new_nsid,
|
||||
int new_ifindex, u32 portid, u32 seq);
|
||||
int new_ifindex, u32 portid,
|
||||
const struct nlmsghdr *nlh);
|
||||
void rtmsg_ifinfo_send(struct sk_buff *skb, struct net_device *dev,
|
||||
gfp_t flags, u32 portid, const struct nlmsghdr *nlh);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user