git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[XFS] Fix up an internal sort function name collision issue.
[safe/jmp/linux-2.6]
/
net
/
netrom
/
nr_dev.c
diff --git
a/net/netrom/nr_dev.c
b/net/netrom/nr_dev.c
index
4c6a985
..
509afdd
100644
(file)
--- a/
net/netrom/nr_dev.c
+++ b/
net/netrom/nr_dev.c
@@
-58,7
+58,7
@@
int nr_rx_ip(struct sk_buff *skb, struct net_device *dev)
/* Spoof incoming device */
skb->dev = dev;
/* Spoof incoming device */
skb->dev = dev;
- skb->
h.raw = skb->data
;
+ skb->
mac.raw = skb->nh.raw
;
skb->nh.raw = skb->data;
skb->pkt_type = PACKET_HOST;
skb->nh.raw = skb->data;
skb->pkt_type = PACKET_HOST;
@@
-160,10
+160,9
@@
static int nr_close(struct net_device *dev)
static int nr_xmit(struct sk_buff *skb, struct net_device *dev)
{
static int nr_xmit(struct sk_buff *skb, struct net_device *dev)
{
- struct net_device_stats *stats = netdev_priv(dev);
- unsigned int len;
-
- len = skb->len;
+ struct nr_private *nr = netdev_priv(dev);
+ struct net_device_stats *stats = &nr->stats;
+ unsigned int len = skb->len;
if (!nr_route_frame(skb, NULL)) {
kfree_skb(skb);
if (!nr_route_frame(skb, NULL)) {
kfree_skb(skb);
@@
-179,7
+178,9
@@
static int nr_xmit(struct sk_buff *skb, struct net_device *dev)
static struct net_device_stats *nr_get_stats(struct net_device *dev)
{
static struct net_device_stats *nr_get_stats(struct net_device *dev)
{
- return netdev_priv(dev);
+ struct nr_private *nr = netdev_priv(dev);
+
+ return &nr->stats;
}
void nr_setup(struct net_device *dev)
}
void nr_setup(struct net_device *dev)
@@
-194,12
+195,11
@@
void nr_setup(struct net_device *dev)
dev->hard_header_len = NR_NETWORK_LEN + NR_TRANSPORT_LEN;
dev->addr_len = AX25_ADDR_LEN;
dev->type = ARPHRD_NETROM;
dev->hard_header_len = NR_NETWORK_LEN + NR_TRANSPORT_LEN;
dev->addr_len = AX25_ADDR_LEN;
dev->type = ARPHRD_NETROM;
- dev->tx_queue_len = 40;
dev->rebuild_header = nr_rebuild_header;
dev->set_mac_address = nr_set_mac_address;
/* New-style flags. */
dev->rebuild_header = nr_rebuild_header;
dev->set_mac_address = nr_set_mac_address;
/* New-style flags. */
- dev->flags =
0
;
+ dev->flags =
IFF_NOARP
;
dev->get_stats = nr_get_stats;
}
dev->get_stats = nr_get_stats;
}