]> err.no Git - linux-2.6/commitdiff
sis190: hard-code the alignment of tiny packets
authorStephen Hemminger <shemminger@vyatta.com>
Sun, 27 Apr 2008 12:42:27 +0000 (14:42 +0200)
committerFrancois Romieu <romieu@fr.zoreil.com>
Sun, 27 Apr 2008 12:42:27 +0000 (14:42 +0200)
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>
drivers/net/sis190.c

index 0d6aa1fc9c68a64d223aeed98c372329ce66e74f..248c3855f4d564e5d9c73bef1f783655c1afa759 100644 (file)
@@ -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);