patch-2.4.21 linux-2.4.21/drivers/net/arcnet/arcnet.c
Next file: linux-2.4.21/drivers/net/arcnet/com20020-pci.c
Previous file: linux-2.4.21/drivers/net/arcnet/arc-rawmode.c
Back to the patch index
Back to the overall index
- Lines: 51
- Date:
2003-06-13 07:51:34.000000000 -0700
- Orig file:
linux-2.4.20/drivers/net/arcnet/arcnet.c
- Orig date:
2002-11-28 15:53:13.000000000 -0800
diff -urN linux-2.4.20/drivers/net/arcnet/arcnet.c linux-2.4.21/drivers/net/arcnet/arcnet.c
@@ -57,8 +57,8 @@
/* "do nothing" functions for protocol drivers */
static void null_rx(struct net_device *dev, int bufnum,
struct archdr *pkthdr, int length);
-static int null_build_header(struct sk_buff *skb, unsigned short type,
- uint8_t daddr);
+static int null_build_header(struct sk_buff *skb, struct net_device *dev,
+ unsigned short type, uint8_t daddr);
static int null_prepare_tx(struct net_device *dev, struct archdr *pkt,
int length, int bufnum);
@@ -512,7 +512,7 @@
arc_bcast_proto->suffix);
proto = arc_bcast_proto;
}
- return proto->build_header(skb, type, _daddr);
+ return proto->build_header(skb, dev, type, _daddr);
}
@@ -528,6 +528,7 @@
int status = 0; /* default is failure */
unsigned short type;
uint8_t daddr=0;
+ struct ArcProto *proto;
if (skb->nh.raw - skb->mac.raw != 2) {
BUGMSG(D_NORMAL,
@@ -556,7 +557,8 @@
return 0;
/* add the _real_ header this time! */
- arc_proto_map[lp->default_proto[daddr]]->build_header(skb, type, daddr);
+ proto = arc_proto_map[lp->default_proto[daddr]];
+ proto->build_header(skb, dev, type, daddr);
return 1; /* success */
}
@@ -986,10 +988,9 @@
}
-static int null_build_header(struct sk_buff *skb, unsigned short type,
- uint8_t daddr)
+static int null_build_header(struct sk_buff *skb, struct net_device *dev,
+ unsigned short type, uint8_t daddr)
{
- struct net_device *dev = skb->dev;
struct arcnet_local *lp = (struct arcnet_local *) dev->priv;
BUGMSG(D_PROTO,
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)