* [PATCH net-next 0/6] net: Convert uses of __constant_<foo> to <foo> @ 2014-03-12 17:04 Joe Perches 2014-03-12 17:04 ` [PATCH net-next 5/6] netfilter: " Joe Perches 0 siblings, 1 reply; 5+ messages in thread From: Joe Perches @ 2014-03-12 17:04 UTC (permalink / raw) To: netdev Cc: linux-kernel, linux-bluetooth, linux-zigbee-devel, netfilter-devel, netfilter, coreteam, tipc-discussion Joe Perches (6): 8021q: Convert uses of __constant_<foo> to <foo> bluetooth: Convert uses of __constant_<foo> to <foo> net: Convert uses of __constant_<foo> to <foo> ieee802154: Convert uses of __constant_<foo> to <foo> netfilter: Convert uses of __constant_<foo> to <foo> tipc: Convert uses of __constant_<foo> to <foo> net/8021q/vlan.h | 4 +- net/8021q/vlan_netlink.c | 4 +- net/bluetooth/a2mp.c | 4 +- net/bluetooth/hci_conn.c | 26 ++++++------ net/bluetooth/hci_core.c | 2 +- net/bluetooth/hci_event.c | 6 +-- net/bluetooth/hci_sock.c | 16 ++++---- net/bluetooth/l2cap_core.c | 90 +++++++++++++++++++++--------------------- net/bluetooth/l2cap_sock.c | 6 +-- net/bluetooth/mgmt.c | 26 ++++++------ net/bluetooth/rfcomm/core.c | 4 +- net/bluetooth/sco.c | 10 ++--- net/bluetooth/smp.c | 2 +- net/core/dev.c | 10 ++--- net/core/flow_dissector.c | 14 +++---- net/ieee802154/6lowpan_rtnl.c | 2 +- net/ieee802154/af_ieee802154.c | 2 +- net/netfilter/ipset/pfxlen.c | 4 +- net/netfilter/xt_AUDIT.c | 4 +- net/tipc/bearer.c | 2 +- 20 files changed, 119 insertions(+), 119 deletions(-) -- 1.8.1.2.459.gbcd45b4.dirty ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH net-next 5/6] netfilter: Convert uses of __constant_<foo> to <foo> 2014-03-12 17:04 [PATCH net-next 0/6] net: Convert uses of __constant_<foo> to <foo> Joe Perches @ 2014-03-12 17:04 ` Joe Perches 2014-03-12 19:28 ` David Miller 2014-03-12 19:41 ` Jozsef Kadlecsik 0 siblings, 2 replies; 5+ messages in thread From: Joe Perches @ 2014-03-12 17:04 UTC (permalink / raw) To: netdev Cc: Pablo Neira Ayuso, Patrick McHardy, Jozsef Kadlecsik, David S. Miller, netfilter-devel, netfilter, coreteam, linux-kernel The use of __constant_<foo> has been unnecessary for quite awhile now. Make these uses consistent with the rest of the kernel. Signed-off-by: Joe Perches <joe@perches.com> --- net/netfilter/ipset/pfxlen.c | 4 ++-- net/netfilter/xt_AUDIT.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/net/netfilter/ipset/pfxlen.c b/net/netfilter/ipset/pfxlen.c index 4f29fa9..04d15fd 100644 --- a/net/netfilter/ipset/pfxlen.c +++ b/net/netfilter/ipset/pfxlen.c @@ -7,8 +7,8 @@ #define E(a, b, c, d) \ {.ip6 = { \ - __constant_htonl(a), __constant_htonl(b), \ - __constant_htonl(c), __constant_htonl(d), \ + htonl(a), htonl(b), \ + htonl(c), htonl(d), \ } } /* diff --git a/net/netfilter/xt_AUDIT.c b/net/netfilter/xt_AUDIT.c index 3228d7f..4973cbd 100644 --- a/net/netfilter/xt_AUDIT.c +++ b/net/netfilter/xt_AUDIT.c @@ -146,11 +146,11 @@ audit_tg(struct sk_buff *skb, const struct xt_action_param *par) if (par->family == NFPROTO_BRIDGE) { switch (eth_hdr(skb)->h_proto) { - case __constant_htons(ETH_P_IP): + case htons(ETH_P_IP): audit_ip4(ab, skb); break; - case __constant_htons(ETH_P_IPV6): + case htons(ETH_P_IPV6): audit_ip6(ab, skb); break; } -- 1.8.1.2.459.gbcd45b4.dirty ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH net-next 5/6] netfilter: Convert uses of __constant_<foo> to <foo> 2014-03-12 17:04 ` [PATCH net-next 5/6] netfilter: " Joe Perches @ 2014-03-12 19:28 ` David Miller 2014-03-13 13:13 ` Pablo Neira Ayuso 2014-03-12 19:41 ` Jozsef Kadlecsik 1 sibling, 1 reply; 5+ messages in thread From: David Miller @ 2014-03-12 19:28 UTC (permalink / raw) To: joe Cc: netdev, pablo, kaber, kadlec, netfilter-devel, netfilter, coreteam, linux-kernel From: Joe Perches <joe@perches.com> Date: Wed, 12 Mar 2014 10:04:19 -0700 > The use of __constant_<foo> has been unnecessary for quite awhile now. > > Make these uses consistent with the rest of the kernel. > > Signed-off-by: Joe Perches <joe@perches.com> Will let the netfilter folks pick this up. ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH net-next 5/6] netfilter: Convert uses of __constant_<foo> to <foo> 2014-03-12 19:28 ` David Miller @ 2014-03-13 13:13 ` Pablo Neira Ayuso 0 siblings, 0 replies; 5+ messages in thread From: Pablo Neira Ayuso @ 2014-03-13 13:13 UTC (permalink / raw) To: David Miller Cc: joe, netdev, kaber, kadlec, netfilter-devel, netfilter, coreteam, linux-kernel On Wed, Mar 12, 2014 at 03:28:55PM -0400, David Miller wrote: > From: Joe Perches <joe@perches.com> > Date: Wed, 12 Mar 2014 10:04:19 -0700 > > > The use of __constant_<foo> has been unnecessary for quite awhile now. > > > > Make these uses consistent with the rest of the kernel. > > > > Signed-off-by: Joe Perches <joe@perches.com> > > Will let the netfilter folks pick this up. Applied, thanks! ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH net-next 5/6] netfilter: Convert uses of __constant_<foo> to <foo> 2014-03-12 17:04 ` [PATCH net-next 5/6] netfilter: " Joe Perches 2014-03-12 19:28 ` David Miller @ 2014-03-12 19:41 ` Jozsef Kadlecsik 1 sibling, 0 replies; 5+ messages in thread From: Jozsef Kadlecsik @ 2014-03-12 19:41 UTC (permalink / raw) To: Joe Perches Cc: netdev, Pablo Neira Ayuso, Patrick McHardy, David S. Miller, netfilter-devel, netfilter, linux-kernel On Wed, 12 Mar 2014, Joe Perches wrote: > The use of __constant_<foo> has been unnecessary for quite awhile now. > > Make these uses consistent with the rest of the kernel. > > Signed-off-by: Joe Perches <joe@perches.com> Acked-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> > --- > net/netfilter/ipset/pfxlen.c | 4 ++-- > net/netfilter/xt_AUDIT.c | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/net/netfilter/ipset/pfxlen.c b/net/netfilter/ipset/pfxlen.c > index 4f29fa9..04d15fd 100644 > --- a/net/netfilter/ipset/pfxlen.c > +++ b/net/netfilter/ipset/pfxlen.c > @@ -7,8 +7,8 @@ > > #define E(a, b, c, d) \ > {.ip6 = { \ > - __constant_htonl(a), __constant_htonl(b), \ > - __constant_htonl(c), __constant_htonl(d), \ > + htonl(a), htonl(b), \ > + htonl(c), htonl(d), \ > } } > > /* > diff --git a/net/netfilter/xt_AUDIT.c b/net/netfilter/xt_AUDIT.c > index 3228d7f..4973cbd 100644 > --- a/net/netfilter/xt_AUDIT.c > +++ b/net/netfilter/xt_AUDIT.c > @@ -146,11 +146,11 @@ audit_tg(struct sk_buff *skb, const struct xt_action_param *par) > > if (par->family == NFPROTO_BRIDGE) { > switch (eth_hdr(skb)->h_proto) { > - case __constant_htons(ETH_P_IP): > + case htons(ETH_P_IP): > audit_ip4(ab, skb); > break; > > - case __constant_htons(ETH_P_IPV6): > + case htons(ETH_P_IPV6): > audit_ip6(ab, skb); > break; > } > -- > 1.8.1.2.459.gbcd45b4.dirty > - E-mail : kadlec@blackhole.kfki.hu, kadlecsik.jozsef@wigner.mta.hu PGP key : http://www.kfki.hu/~kadlec/pgp_public_key.txt Address : Wigner Research Centre for Physics, Hungarian Academy of Sciences H-1525 Budapest 114, POB. 49, Hungary ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-03-13 13:13 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2014-03-12 17:04 [PATCH net-next 0/6] net: Convert uses of __constant_<foo> to <foo> Joe Perches 2014-03-12 17:04 ` [PATCH net-next 5/6] netfilter: " Joe Perches 2014-03-12 19:28 ` David Miller 2014-03-13 13:13 ` Pablo Neira Ayuso 2014-03-12 19:41 ` Jozsef Kadlecsik
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).