| Message ID | 1317994221.3988.12.camel@jlt3.sipsolutions.net |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On Fri, Oct 07, 2011 at 03:30:20PM +0200, Johannes Berg wrote: > From: Johannes Berg <johannes.berg@intel.com> > > There's no point in open-coding sock_valbool_flag(). > > Signed-off-by: Johannes Berg <johannes.berg@intel.com> > --- > net/core/sock.c | 5 +---- > 1 file changed, 1 insertion(+), 4 deletions(-) > > --- a/net/core/sock.c 2011-10-07 15:26:30.000000000 +0200 > +++ b/net/core/sock.c 2011-10-07 15:27:46.000000000 +0200 > @@ -738,10 +738,7 @@ set_rcvbuf: > /* We implement the SO_SNDLOWAT etc to > not be settable (1003.1g 5.3) */ > case SO_RXQ_OVFL: > - if (valbool) > - sock_set_flag(sk, SOCK_RXQ_OVFL); > - else > - sock_reset_flag(sk, SOCK_RXQ_OVFL); > + sock_valbool_flag(sk, SOCK_RXQ_OVFL, valbool); > break; > default: > ret = -ENOPROTOOPT; > > > -- > To unsubscribe from this list: send the line "unsubscribe netdev" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Looks good, thanks Johannes! Acked-by: Neil Horman <nhorman@tuxdriver.com> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Neil Horman <nhorman@tuxdriver.com> Date: Fri, 7 Oct 2011 09:40:23 -0400 > On Fri, Oct 07, 2011 at 03:30:20PM +0200, Johannes Berg wrote: >> From: Johannes Berg <johannes.berg@intel.com> >> >> There's no point in open-coding sock_valbool_flag(). >> >> Signed-off-by: Johannes Berg <johannes.berg@intel.com> ... > Looks good, thanks Johannes! > Acked-by: Neil Horman <nhorman@tuxdriver.com> Applied to net-next, thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
--- a/net/core/sock.c 2011-10-07 15:26:30.000000000 +0200 +++ b/net/core/sock.c 2011-10-07 15:27:46.000000000 +0200 @@ -738,10 +738,7 @@ set_rcvbuf: /* We implement the SO_SNDLOWAT etc to not be settable (1003.1g 5.3) */ case SO_RXQ_OVFL: - if (valbool) - sock_set_flag(sk, SOCK_RXQ_OVFL); - else - sock_reset_flag(sk, SOCK_RXQ_OVFL); + sock_valbool_flag(sk, SOCK_RXQ_OVFL, valbool); break; default: ret = -ENOPROTOOPT;