[NETROM]: Fix rebuild header mess
For reason that probably nobody recalls NET/ROM does it's actual packet transmission in nr_rebuild_header and even treats invocation of it's hard_start_xmit method nr_xmit as a bug. Fix that by splitting the job done by nr_rebuild_header into two halves. Along with that we now also can get rid of the silly clone of the skb on transmit. Signed-off-by: Ralf Baechle DL5RB <ralf@linux-mips.org> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
6f74998e5c
commit
3f2aadd041
|
@ -71,15 +71,10 @@ int nr_rx_ip(struct sk_buff *skb, struct net_device *dev)
|
||||||
|
|
||||||
static int nr_rebuild_header(struct sk_buff *skb)
|
static int nr_rebuild_header(struct sk_buff *skb)
|
||||||
{
|
{
|
||||||
struct net_device *dev = skb->dev;
|
|
||||||
struct net_device_stats *stats = netdev_priv(dev);
|
|
||||||
struct sk_buff *skbn;
|
|
||||||
unsigned char *bp = skb->data;
|
unsigned char *bp = skb->data;
|
||||||
int len;
|
|
||||||
|
|
||||||
if (arp_find(bp + 7, skb)) {
|
if (arp_find(bp + 7, skb))
|
||||||
return 1;
|
return 1;
|
||||||
}
|
|
||||||
|
|
||||||
bp[6] &= ~AX25_CBIT;
|
bp[6] &= ~AX25_CBIT;
|
||||||
bp[6] &= ~AX25_EBIT;
|
bp[6] &= ~AX25_EBIT;
|
||||||
|
@ -90,27 +85,7 @@ static int nr_rebuild_header(struct sk_buff *skb)
|
||||||
bp[6] |= AX25_EBIT;
|
bp[6] |= AX25_EBIT;
|
||||||
bp[6] |= AX25_SSSID_SPARE;
|
bp[6] |= AX25_SSSID_SPARE;
|
||||||
|
|
||||||
if ((skbn = skb_clone(skb, GFP_ATOMIC)) == NULL) {
|
return 0;
|
||||||
kfree_skb(skb);
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (skb->sk != NULL)
|
|
||||||
skb_set_owner_w(skbn, skb->sk);
|
|
||||||
|
|
||||||
kfree_skb(skb);
|
|
||||||
|
|
||||||
len = skbn->len;
|
|
||||||
|
|
||||||
if (!nr_route_frame(skbn, NULL)) {
|
|
||||||
kfree_skb(skbn);
|
|
||||||
stats->tx_errors++;
|
|
||||||
}
|
|
||||||
|
|
||||||
stats->tx_packets++;
|
|
||||||
stats->tx_bytes += len;
|
|
||||||
|
|
||||||
return 1;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#else
|
#else
|
||||||
|
@ -186,8 +161,19 @@ 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);
|
struct net_device_stats *stats = netdev_priv(dev);
|
||||||
dev_kfree_skb(skb);
|
unsigned int len;
|
||||||
stats->tx_errors++;
|
|
||||||
|
len = skb->len;
|
||||||
|
|
||||||
|
if (!nr_route_frame(skb, NULL)) {
|
||||||
|
kfree_skb(skb);
|
||||||
|
stats->tx_errors++;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
stats->tx_packets++;
|
||||||
|
stats->tx_bytes += len;
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue