diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-30 03:48:57 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-30 03:48:57 -0400 |
| commit | 2fcf522509cceea524b6e7ece8fd6759b682175a (patch) | |
| tree | d356e87307e451cce5497ad8daeeeb047befe489 /drivers/net/rrunner.c | |
| parent | da61396d24e37258817e42537c482e962b4742f7 (diff) | |
| parent | 1fdab81e675c6ef76a49b8aabb7eaf4be51d1b80 (diff) | |
/spare/repo/libata-dev branch 'master'
Diffstat (limited to 'drivers/net/rrunner.c')
| -rw-r--r-- | drivers/net/rrunner.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/rrunner.c b/drivers/net/rrunner.c index 12a86f96d973..ec1a18d189a1 100644 --- a/drivers/net/rrunner.c +++ b/drivers/net/rrunner.c | |||
| @@ -1429,6 +1429,7 @@ static int rr_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
| 1429 | { | 1429 | { |
| 1430 | struct rr_private *rrpriv = netdev_priv(dev); | 1430 | struct rr_private *rrpriv = netdev_priv(dev); |
| 1431 | struct rr_regs __iomem *regs = rrpriv->regs; | 1431 | struct rr_regs __iomem *regs = rrpriv->regs; |
| 1432 | struct hippi_cb *hcb = (struct hippi_cb *) skb->cb; | ||
| 1432 | struct ring_ctrl *txctrl; | 1433 | struct ring_ctrl *txctrl; |
| 1433 | unsigned long flags; | 1434 | unsigned long flags; |
| 1434 | u32 index, len = skb->len; | 1435 | u32 index, len = skb->len; |
| @@ -1460,7 +1461,7 @@ static int rr_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
| 1460 | ifield = (u32 *)skb_push(skb, 8); | 1461 | ifield = (u32 *)skb_push(skb, 8); |
| 1461 | 1462 | ||
| 1462 | ifield[0] = 0; | 1463 | ifield[0] = 0; |
| 1463 | ifield[1] = skb->private.ifield; | 1464 | ifield[1] = hcb->ifield; |
| 1464 | 1465 | ||
| 1465 | /* | 1466 | /* |
| 1466 | * We don't need the lock before we are actually going to start | 1467 | * We don't need the lock before we are actually going to start |
