* [PATCH 2/2][BRIDGE] convert __constant_htons(constant) to htons
@ 2004-10-05 22:08 Arnaldo Carvalho de Melo
2004-10-06 17:02 ` David S. Miller
0 siblings, 1 reply; 2+ messages in thread
From: Arnaldo Carvalho de Melo @ 2004-10-05 22:08 UTC (permalink / raw)
To: David S. Miller; +Cc: netdev
[-- Attachment #1: Type: text/plain, Size: 200 bytes --]
Hi David,
Please consider pulling from:
bk://kernel.bkbits.net/acme/sk_buff-2.6
Now there are just these two changesets in this tree, will
wait for you to pull to submit the next set.
- Arnaldo
[-- Attachment #2: bridge_htons.patch --]
[-- Type: text/plain, Size: 3424 bytes --]
===================================================================
ChangeSet@1.2054, 2004-10-05 19:01:58-03:00, acme@conectiva.com.br
[BRIDGE] convert __constant_htons(constant) to htons
Signed-off-by: Arnaldo Carvalho de Melo <acme@conectiva.com.br>
Signed-off-by: David S. Miller <davem@redhat.com>
ebt_arp.c | 4 ++--
ebt_arpreply.c | 6 +++---
ebt_ip.c | 2 +-
ebt_log.c | 2 +-
ebt_vlan.c | 2 +-
5 files changed, 8 insertions(+), 8 deletions(-)
diff -Nru a/net/bridge/netfilter/ebt_arp.c b/net/bridge/netfilter/ebt_arp.c
--- a/net/bridge/netfilter/ebt_arp.c 2004-10-05 19:02:40 -03:00
+++ b/net/bridge/netfilter/ebt_arp.c 2004-10-05 19:02:40 -03:00
@@ -108,8 +108,8 @@
if (datalen != EBT_ALIGN(sizeof(struct ebt_arp_info)))
return -EINVAL;
- if ((e->ethproto != __constant_htons(ETH_P_ARP) &&
- e->ethproto != __constant_htons(ETH_P_RARP)) ||
+ if ((e->ethproto != htons(ETH_P_ARP) &&
+ e->ethproto != htons(ETH_P_RARP)) ||
e->invflags & EBT_IPROTO)
return -EINVAL;
if (info->bitmask & ~EBT_ARP_MASK || info->invflags & ~EBT_ARP_MASK)
diff -Nru a/net/bridge/netfilter/ebt_arpreply.c b/net/bridge/netfilter/ebt_arpreply.c
--- a/net/bridge/netfilter/ebt_arpreply.c 2004-10-05 19:02:40 -03:00
+++ b/net/bridge/netfilter/ebt_arpreply.c 2004-10-05 19:02:40 -03:00
@@ -29,9 +29,9 @@
if (ap == NULL)
return EBT_DROP;
- if (ap->ar_op != __constant_htons(ARPOP_REQUEST) ||
+ if (ap->ar_op != htons(ARPOP_REQUEST) ||
ap->ar_hln != ETH_ALEN ||
- ap->ar_pro != __constant_htons(ETH_P_IP) ||
+ ap->ar_pro != htons(ETH_P_IP) ||
ap->ar_pln != 4)
return EBT_CONTINUE;
@@ -65,7 +65,7 @@
return -EINVAL;
if (BASE_CHAIN && info->target == EBT_RETURN)
return -EINVAL;
- if (e->ethproto != __constant_htons(ETH_P_ARP) ||
+ if (e->ethproto != htons(ETH_P_ARP) ||
e->invflags & EBT_IPROTO)
return -EINVAL;
CLEAR_BASE_CHAIN_BIT;
diff -Nru a/net/bridge/netfilter/ebt_ip.c b/net/bridge/netfilter/ebt_ip.c
--- a/net/bridge/netfilter/ebt_ip.c 2004-10-05 19:02:40 -03:00
+++ b/net/bridge/netfilter/ebt_ip.c 2004-10-05 19:02:40 -03:00
@@ -80,7 +80,7 @@
if (datalen != EBT_ALIGN(sizeof(struct ebt_ip_info)))
return -EINVAL;
- if (e->ethproto != __constant_htons(ETH_P_IP) ||
+ if (e->ethproto != htons(ETH_P_IP) ||
e->invflags & EBT_IPROTO)
return -EINVAL;
if (info->bitmask & ~EBT_IP_MASK || info->invflags & ~EBT_IP_MASK)
diff -Nru a/net/bridge/netfilter/ebt_log.c b/net/bridge/netfilter/ebt_log.c
--- a/net/bridge/netfilter/ebt_log.c 2004-10-05 19:02:40 -03:00
+++ b/net/bridge/netfilter/ebt_log.c 2004-10-05 19:02:40 -03:00
@@ -121,7 +121,7 @@
/* If it's for Ethernet and the lengths are OK,
* then log the ARP payload */
- if (ah->ar_hrd == __constant_htons(1) &&
+ if (ah->ar_hrd == htons(1) &&
ah->ar_hln == ETH_ALEN &&
ah->ar_pln == sizeof(uint32_t)) {
struct arppayload _arpp, *ap;
diff -Nru a/net/bridge/netfilter/ebt_vlan.c b/net/bridge/netfilter/ebt_vlan.c
--- a/net/bridge/netfilter/ebt_vlan.c 2004-10-05 19:02:40 -03:00
+++ b/net/bridge/netfilter/ebt_vlan.c 2004-10-05 19:02:40 -03:00
@@ -104,7 +104,7 @@
}
/* Is it 802.1Q frame checked? */
- if (e->ethproto != __constant_htons(ETH_P_8021Q)) {
+ if (e->ethproto != htons(ETH_P_8021Q)) {
DEBUG_MSG
("passed entry proto %2.4X is not 802.1Q (8100)\n",
(unsigned short) ntohs(e->ethproto));
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH 2/2][BRIDGE] convert __constant_htons(constant) to htons
2004-10-05 22:08 [PATCH 2/2][BRIDGE] convert __constant_htons(constant) to htons Arnaldo Carvalho de Melo
@ 2004-10-06 17:02 ` David S. Miller
0 siblings, 0 replies; 2+ messages in thread
From: David S. Miller @ 2004-10-06 17:02 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo; +Cc: netdev
On Tue, 05 Oct 2004 19:08:45 -0300
Arnaldo Carvalho de Melo <acme@conectiva.com.br> wrote:
> Please consider pulling from:
>
> bk://kernel.bkbits.net/acme/sk_buff-2.6
>
> Now there are just these two changesets in this tree, will
> wait for you to pull to submit the next set.
Looks good, pulled into my tree.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2004-10-06 17:02 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2004-10-05 22:08 [PATCH 2/2][BRIDGE] convert __constant_htons(constant) to htons Arnaldo Carvalho de Melo
2004-10-06 17:02 ` David S. Miller
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).