summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2007-02-09 17:40:10 +0100
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-09 18:14:08 +0100
commitb53449725a9a436fb9cc2f2ef8579368a704db03 (patch)
tree53eb73c37a84588012d6d9a1012a4e1c0dce9aa9 /drivers
parent[PATCH] pc300too annotation fixes (diff)
downloadlinux-b53449725a9a436fb9cc2f2ef8579368a704db03.tar.xz
linux-b53449725a9a436fb9cc2f2ef8579368a704db03.zip
[PATCH] trivial cxgb3 annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/cxgb3/cxgb3_offload.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/cxgb3/cxgb3_offload.c b/drivers/net/cxgb3/cxgb3_offload.c
index c3a02d613382..c6b726643185 100644
--- a/drivers/net/cxgb3/cxgb3_offload.c
+++ b/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;