From: Stephen Hemminger <shemminger@vyatta.com>
Date: Sun, 27 Apr 2008 12:42:27 +0000 (+0200)
Subject: sis190: hard-code the alignment of tiny packets
X-Git-Tag: firefly_0821_release~20572^2~46^2~4
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e3eccad9f6e84656b45bfa07738934145b09e11e;p=firefly-linux-kernel-4.4.55.git

sis190: hard-code the alignment of tiny packets

There is no DMA involved here. Align the IP header without condition.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Acked-by: Francois Romieu <romieu@fr.zoreil.com>
---

diff --git a/drivers/net/sis190.c b/drivers/net/sis190.c
index 0d6aa1fc9c68..248c3855f4d5 100644
--- a/drivers/net/sis190.c
+++ b/drivers/net/sis190.c
@@ -526,9 +526,9 @@ static inline int sis190_try_rx_copy(struct sk_buff **sk_buff, int pkt_size,
 	if (pkt_size < rx_copybreak) {
 		struct sk_buff *skb;
 
-		skb = dev_alloc_skb(pkt_size + NET_IP_ALIGN);
+		skb = dev_alloc_skb(pkt_size + 2);
 		if (skb) {
-			skb_reserve(skb, NET_IP_ALIGN);
+			skb_reserve(skb, 2);
 			skb_copy_to_linear_data(skb, sk_buff[0]->data, pkt_size);
 			*sk_buff = skb;
 			sis190_give_to_asic(desc, rx_buf_sz);