| Submitter | Johannes Berg |
|---|---|
| Date | April 21, 2010, 7:06 a.m. |
| Message ID | <1271833567.3627.12.camel@jlt3.sipsolutions.net> |
| Download | mbox | patch |
| Permalink | /patch/50635/ |
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
Comments
From: Johannes Berg <johannes@sipsolutions.net> Date: Wed, 21 Apr 2010 09:06:07 +0200 > Eric's recent patch added __force, but this > place would seem to require actually doing > a byte order conversion so the printk is > consistent across architectures. > > Cc: Eric Dumazet <eric.dumazet@gmail.com> > Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Applied to net-next-2.6, thanks a lot Johannes. -- 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
Patch
diff --git a/net/ethernet/eth.c b/net/ethernet/eth.c index 3584696..0c0d272 100644 --- a/net/ethernet/eth.c +++ b/net/ethernet/eth.c @@ -136,7 +136,7 @@ int eth_rebuild_header(struct sk_buff *skb) default: printk(KERN_DEBUG "%s: unable to resolve type %X addresses.\n", - dev->name, (__force int)eth->h_proto); + dev->name, ntohs(eth->h_proto)); memcpy(eth->h_source, dev->dev_addr, ETH_ALEN); break;
Eric's recent patch added __force, but this place would seem to require actually doing a byte order conversion so the printk is consistent across architectures. Cc: Eric Dumazet <eric.dumazet@gmail.com> Signed-off-by: Johannes Berg <johannes@sipsolutions.net> --- net/ethernet/eth.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- 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