diff options
| author | David S. Miller <davem@davemloft.net> | 2016-01-12 05:55:43 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-01-12 05:55:43 +0100 |
| commit | 9d367eddf363553c7668ba92c3b9d187ec4f71f7 (patch) | |
| tree | 4f06d334d316390cc9a869ce3e74ec48d32ed0f8 /include/net | |
| parent | net: Fix typo in netdev_intersect_features (diff) | |
| parent | bonding: Prevent IPv6 link local address on enslaved devices (diff) | |
| download | linux-9d367eddf363553c7668ba92c3b9d187ec4f71f7.tar.xz linux-9d367eddf363553c7668ba92c3b9d187ec4f71f7.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/bonding/bond_main.c
drivers/net/ethernet/mellanox/mlxsw/spectrum.h
drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
The bond_main.c and mellanox switch conflicts were cases of
overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/protocol.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/protocol.h b/include/net/protocol.h index d6fcc1fcdb5b..da689f5432de 100644 --- a/include/net/protocol.h +++ b/include/net/protocol.h @@ -107,7 +107,7 @@ int inet_del_offload(const struct net_offload *prot, unsigned char num); void inet_register_protosw(struct inet_protosw *p); void inet_unregister_protosw(struct inet_protosw *p); -int udp_add_offload(struct udp_offload *prot); +int udp_add_offload(struct net *net, struct udp_offload *prot); void udp_del_offload(struct udp_offload *prot); #if IS_ENABLED(CONFIG_IPV6) |