upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-28 04:12:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

LinuxKPI: add KPI for netdev_notifier_info returning ifp

Browse source 
While currently the ifp gets cast to a net_device and then returned
and consumers are expecting an ifp again, allow parallel usage now and
in the future by extending and also passing the ifp directly back in
the netdev_notifier_info.  Add a function to return the ifp instead of
the net_device.

Sponsored by:	The FreeBSD Foundation
Suggested by:	hselasky
Reviewed by:	hselasky
Differential Revision: https://reviews.freebsd.org/D30522

(cherry picked from commit 801cf532e7)
This commit is contained in:
Bjoern A. Zeeb 2021-05-28 12:44:16 +00:00
parent a30fe52a12
commit 4b2af7db20
2 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
sys/compat/linuxkpi/common/include/linux/netdevice.h
View file

@ -59,6 +59,7 @@
/* According to linux::ipoib_main.c. */
struct netdev_notifier_info {
struct net_device *dev;
struct ifnet *ifp;
};
static inline struct net_device *
@ -67,6 +68,12 @@ netdev_notifier_info_to_dev(struct netdev_notifier_info *ni)
return (ni->dev);
}
static inline struct ifnet *
netdev_notifier_info_to_ifp(struct netdev_notifier_info *ni)
{
return (ni->ifp);
}
int register_netdevice_notifier(struct notifier_block *);
int register_inetaddr_notifier(struct notifier_block *);
int unregister_netdevice_notifier(struct notifier_block *);

5
sys/compat/linuxkpi/common/src/linux_compat.c
View file

@ -2315,6 +2315,7 @@ linux_handle_ifnet_link_event(void *arg, struct ifnet *ifp, int linkstate)
struct netdev_notifier_info ni;
nb = arg;
ni.ifp = ifp;
ni.dev = (struct net_device *)ifp;
if (linkstate == LINK_STATE_UP)
nb->notifier_call(nb, NETDEV_UP, &ni);
@ -2329,6 +2330,7 @@ linux_handle_ifnet_arrival_event(void *arg, struct ifnet *ifp)
struct netdev_notifier_info ni;
nb = arg;
ni.ifp = ifp;
ni.dev = (struct net_device *)ifp;
nb->notifier_call(nb, NETDEV_REGISTER, &ni);
}
@ -2340,6 +2342,7 @@ linux_handle_ifnet_departure_event(void *arg, struct ifnet *ifp)
struct netdev_notifier_info ni;
nb = arg;
ni.ifp = ifp;
ni.dev = (struct net_device *)ifp;
nb->notifier_call(nb, NETDEV_UNREGISTER, &ni);
}
@ -2351,6 +2354,7 @@ linux_handle_iflladdr_event(void *arg, struct ifnet *ifp)
struct netdev_notifier_info ni;
nb = arg;
ni.ifp = ifp;
ni.dev = (struct net_device *)ifp;
nb->notifier_call(nb, NETDEV_CHANGEADDR, &ni);
}
@ -2362,6 +2366,7 @@ linux_handle_ifaddr_event(void *arg, struct ifnet *ifp)
struct netdev_notifier_info ni;
nb = arg;
ni.ifp = ifp;
ni.dev = (struct net_device *)ifp;
nb->notifier_call(nb, NETDEV_CHANGEIFADDR, &ni);
}