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

Commit 4e6c709c authored by Auke Kok's avatar Auke Kok Committed by David S. Miller
Browse files

e1000e: Simple optimizations in e1000_xmit_frame 



After an e1000 patch from Krishna Kumar <krkumar2@in.ibm.com>.

Signed-off-by: default avatarAuke Kok <auke-jan.h.kok@intel.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 6d1e3aa7

drivers/net/e1000e/netdev.c

+4 −5
Original line number Diff line number Diff line
@@ -3424,14 +3424,13 @@ static int e1000_xmit_frame(struct sk_buff *skb, struct net_device *netdev) 
	unsigned int max_per_txd = E1000_MAX_PER_TXD;

	unsigned int max_txd_pwr = E1000_MAX_TXD_PWR;

	unsigned int tx_flags = 0;

	unsigned int len = skb->len;

	unsigned int len = skb->len - skb->data_len;

	unsigned long irq_flags;

	unsigned int nr_frags = 0;

	unsigned int mss = 0;

	unsigned int nr_frags;

	unsigned int mss;

	int count = 0;

	int tso;

	unsigned int f;

	len -= skb->data_len;



	if (test_bit(__E1000_DOWN, &adapter->state)) {

		dev_kfree_skb_any(skb);
@@ -3459,7 +3458,7 @@ static int e1000_xmit_frame(struct sk_buff *skb, struct net_device *netdev) 
		* points to just header, pull a few bytes of payload from

		* frags into skb->data */

		hdr_len = skb_transport_offset(skb) + tcp_hdrlen(skb);

		if (skb->data_len && (hdr_len == (skb->len - skb->data_len))) {

		if (skb->data_len && (hdr_len == len)) {

			unsigned int pull_size;



			pull_size = min((unsigned int)4, skb->data_len);