d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ifnet/API: Change if_set*bit accessors to clear first

Browse Source 
Summary:
A common pattern has been to:

	if (foo)
		caps = IFCAP_FOO;
	ifp->if_capenable &= ~IFCAP_FOO;
	ifp->if_capenable |= caps;

which in the new order of things would be:

	if (foo)
		caps = IF_FOO;
	if_setcapenablebits(ifp, 0, IFCAP_FOO);
	if_setcapenablebits(ifp, caps, 0);

This change streamlines this into:

	if (foo)
		caps = IF_FOO;
	if_setcapenablebits(ifp, caps, IFCAP_FOO);

Reviewed by:	melifaro
Sponsored by:	Juniper Networks, Inc.
Differential Revision: https://reviews.freebsd.org/D37993
This commit is contained in:
Justin Hibbits 2023-01-09 14:24:08 -05:00
parent 3b073d2ee5
commit d34678395f
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/net/if.c
View File

@ -4211,8 +4211,8 @@ if_setcapabilities(if_t ifp, int capabilities)
int
if_setcapabilitiesbit(if_t ifp, int setbit, int clearbit)
{
((struct ifnet *)ifp)->if_capabilities |= setbit;
((struct ifnet *)ifp)->if_capabilities &= ~clearbit;
((struct ifnet *)ifp)->if_capabilities |= setbit;
return (0);
}
@ -4233,10 +4233,10 @@ if_setcapenable(if_t ifp, int capabilities)
int
if_setcapenablebit(if_t ifp, int setcap, int clearcap)
{
if(setcap)
((struct ifnet *)ifp)->if_capenable |= setcap;
if(clearcap)
((struct ifnet *)ifp)->if_capenable &= ~clearcap;
if(setcap)
((struct ifnet *)ifp)->if_capenable |= setcap;
return (0);
}
@ -4339,8 +4339,8 @@ if_setdev(if_t ifp, void *dev)
int
if_setdrvflagbits(if_t ifp, int set_flags, int clear_flags)
{
((struct ifnet *)ifp)->if_drv_flags |= set_flags;
((struct ifnet *)ifp)->if_drv_flags &= ~clear_flags;
((struct ifnet *)ifp)->if_drv_flags |= set_flags;
return (0);
}
@ -4369,8 +4369,8 @@ if_setflags(if_t ifp, int flags)
int
if_setflagbits(if_t ifp, int set, int clear)
{
((struct ifnet *)ifp)->if_flags |= set;
((struct ifnet *)ifp)->if_flags &= ~clear;
((struct ifnet *)ifp)->if_flags |= set;
return (0);
}
@ -4391,8 +4391,8 @@ if_clearhwassist(if_t ifp)
int
if_sethwassistbits(if_t ifp, int toset, int toclear)
{
((struct ifnet *)ifp)->if_hwassist |= toset;
((struct ifnet *)ifp)->if_hwassist &= ~toclear;
((struct ifnet *)ifp)->if_hwassist |= toset;
return (0);
}