From 7dc82101afb9e278286be42dc6d99c338d750d84 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@ftp.linux.org.uk>
Date: Fri, 9 Feb 2007 16:40:10 +0000
Subject: [PATCH] --- yaml --- r: 47275 b: refs/heads/master c:
 b53449725a9a436fb9cc2f2ef8579368a704db03 h: refs/heads/master i:   47273:
 81b46ed6a833da6729a0234beb9e099a2df237e4   47271:
 9cfa89af303cf8cb5c71baa6f7cd5a9ae47a2257 v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/net/cxgb3/cxgb3_offload.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 7f3dc310570d..7a59d8c602c2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 184123dbd6629ef32e9fe4749163701e86f2b02c
+refs/heads/master: b53449725a9a436fb9cc2f2ef8579368a704db03
diff --git a/trunk/drivers/net/cxgb3/cxgb3_offload.c b/trunk/drivers/net/cxgb3/cxgb3_offload.c
index c3a02d613382..c6b726643185 100644
--- a/trunk/drivers/net/cxgb3/cxgb3_offload.c
+++ b/trunk/drivers/net/cxgb3/cxgb3_offload.c
@@ -396,7 +396,7 @@ static int rx_offload_blackhole(struct t3cdev *dev, struct sk_buff **skbs,
 				int n)
 {
 	CH_ERR(tdev2adap(dev), "%d unexpected offload packets, first data %u\n",
-	       n, ntohl(*(u32 *)skbs[0]->data));
+	       n, ntohl(*(__be32 *)skbs[0]->data));
 	while (n--)
 		dev_kfree_skb_any(skbs[n]);
 	return 0;
@@ -755,7 +755,7 @@ static int do_trace(struct t3cdev *dev, struct sk_buff *skb)
 {
 	struct cpl_trace_pkt *p = cplhdr(skb);
 
-	skb->protocol = 0xffff;
+	skb->protocol = htons(0xffff);
 	skb->dev = dev->lldev;
 	skb_pull(skb, sizeof(*p));
 	skb->mac.raw = skb->data;