diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2007-03-19 18:27:07 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-26 01:24:23 -0400 |
commit | c1a4b86e396b6870b420d23e4d49c7b685aef0a4 (patch) | |
tree | 5b5377d1aba8bb5f525833c21a50e06a4f8279a1 /drivers/net/tokenring/lanstreamer.c | |
parent | 7c81fd8bfbaa9732eca142350de5154da6919411 (diff) |
[TR]: Use tr_hdr() were appropriate
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/tokenring/lanstreamer.c')
-rw-r--r-- | drivers/net/tokenring/lanstreamer.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/tokenring/lanstreamer.c b/drivers/net/tokenring/lanstreamer.c index e999feb8c0bb..5e1b884e10c1 100644 --- a/drivers/net/tokenring/lanstreamer.c +++ b/drivers/net/tokenring/lanstreamer.c | |||
@@ -1607,10 +1607,12 @@ static void streamer_arb_cmd(struct net_device *dev) | |||
1607 | frame_data, buffer_len); | 1607 | frame_data, buffer_len); |
1608 | } while (next_ptr && (buff_off = next_ptr)); | 1608 | } while (next_ptr && (buff_off = next_ptr)); |
1609 | 1609 | ||
1610 | mac_frame->dev = dev; | ||
1611 | mac_frame->protocol = tr_type_trans(mac_frame, dev); | ||
1610 | #if STREAMER_NETWORK_MONITOR | 1612 | #if STREAMER_NETWORK_MONITOR |
1611 | printk(KERN_WARNING "%s: Received MAC Frame, details: \n", | 1613 | printk(KERN_WARNING "%s: Received MAC Frame, details: \n", |
1612 | dev->name); | 1614 | dev->name); |
1613 | mac_hdr = (struct trh_hdr *) mac_frame->data; | 1615 | mac_hdr = tr_hdr(mac_frame); |
1614 | printk(KERN_WARNING | 1616 | printk(KERN_WARNING |
1615 | "%s: MAC Frame Dest. Addr: %02x:%02x:%02x:%02x:%02x:%02x \n", | 1617 | "%s: MAC Frame Dest. Addr: %02x:%02x:%02x:%02x:%02x:%02x \n", |
1616 | dev->name, mac_hdr->daddr[0], mac_hdr->daddr[1], | 1618 | dev->name, mac_hdr->daddr[0], mac_hdr->daddr[1], |
@@ -1622,8 +1624,6 @@ static void streamer_arb_cmd(struct net_device *dev) | |||
1622 | mac_hdr->saddr[2], mac_hdr->saddr[3], | 1624 | mac_hdr->saddr[2], mac_hdr->saddr[3], |
1623 | mac_hdr->saddr[4], mac_hdr->saddr[5]); | 1625 | mac_hdr->saddr[4], mac_hdr->saddr[5]); |
1624 | #endif | 1626 | #endif |
1625 | mac_frame->dev = dev; | ||
1626 | mac_frame->protocol = tr_type_trans(mac_frame, dev); | ||
1627 | netif_rx(mac_frame); | 1627 | netif_rx(mac_frame); |
1628 | 1628 | ||
1629 | /* Now tell the card we have dealt with the received frame */ | 1629 | /* Now tell the card we have dealt with the received frame */ |