git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
net
/
rose
/
rose_dev.c
diff --git
a/net/rose/rose_dev.c
b/net/rose/rose_dev.c
index
2a1bf8e
..
7c279e2
100644
(file)
--- a/
net/rose/rose_dev.c
+++ b/
net/rose/rose_dev.c
@@
-6,7
+6,6
@@
*
* Copyright (C) Jonathan Naylor G4KLX (g4klx@g4klx.demon.co.uk)
*/
*
* Copyright (C) Jonathan Naylor G4KLX (g4klx@g4klx.demon.co.uk)
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/proc_fs.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/proc_fs.h>
#include <linux/kernel.h>
@@
-60,6
+59,7
@@
static int rose_rebuild_header(struct sk_buff *skb)
struct net_device_stats *stats = netdev_priv(dev);
unsigned char *bp = (unsigned char *)skb->data;
struct sk_buff *skbn;
struct net_device_stats *stats = netdev_priv(dev);
unsigned char *bp = (unsigned char *)skb->data;
struct sk_buff *skbn;
+ unsigned int len;
#ifdef CONFIG_INET
if (arp_find(bp + 7, skb)) {
#ifdef CONFIG_INET
if (arp_find(bp + 7, skb)) {
@@
-76,6
+76,8
@@
static int rose_rebuild_header(struct sk_buff *skb)
kfree_skb(skb);
kfree_skb(skb);
+ len = skbn->len;
+
if (!rose_route_frame(skbn, NULL)) {
kfree_skb(skbn);
stats->tx_errors++;
if (!rose_route_frame(skbn, NULL)) {
kfree_skb(skbn);
stats->tx_errors++;
@@
-83,7
+85,7
@@
static int rose_rebuild_header(struct sk_buff *skb)
}
stats->tx_packets++;
}
stats->tx_packets++;
- stats->tx_bytes +=
skbn->
len;
+ stats->tx_bytes += len;
#endif
return 1;
}
#endif
return 1;
}