Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3f2aadd0 authored by Ralf Baechle's avatar Ralf Baechle Committed by David S. Miller
Browse files

[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: default avatarRalf Baechle DL5RB <ralf@linux-mips.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6f74998e

net/netrom/nr_dev.c

+15 −29
Original line number Diff line number Diff line
@@ -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)

{

	struct net_device *dev = skb->dev;

	struct net_device_stats *stats = netdev_priv(dev);

	struct sk_buff *skbn;

	unsigned char *bp = skb->data;

	int len;



	if (arp_find(bp + 7, skb)) {

	if (arp_find(bp + 7, skb))

		return 1;

	}



	bp[6] &= ~AX25_CBIT;

	bp[6] &= ~AX25_EBIT;
@@ -90,27 +85,7 @@ static int nr_rebuild_header(struct sk_buff *skb) 
	bp[6] |= AX25_EBIT;

	bp[6] |= AX25_SSSID_SPARE;



	if ((skbn = skb_clone(skb, GFP_ATOMIC)) == NULL) {

		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;

	return 0;

}



#else
@@ -186,11 +161,22 @@ static int nr_close(struct net_device *dev) 
static int nr_xmit(struct sk_buff *skb, struct net_device *dev)

{

	struct net_device_stats *stats = netdev_priv(dev);

	dev_kfree_skb(skb);

	unsigned int len;



	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;

}



static struct net_device_stats *nr_get_stats(struct net_device *dev)

{

	return netdev_priv(dev);