aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@vyatta.com>2008-04-27 08:42:27 -0400
committerFrancois Romieu <romieu@fr.zoreil.com>2008-04-27 08:42:27 -0400
commite3eccad9f6e84656b45bfa07738934145b09e11e (patch)
tree3a3b117d6c870c34e48379e7e3381ab7c968d7eb
parent4709aa59ede5ff9902d60088d93d1c0e2e9d2247 (diff)
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>
-rw-r--r--drivers/net/sis190.c4
1 files changed, 2 insertions, 2 deletions
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,
526 if (pkt_size < rx_copybreak) { 526 if (pkt_size < rx_copybreak) {
527 struct sk_buff *skb; 527 struct sk_buff *skb;
528 528
529 skb = dev_alloc_skb(pkt_size + NET_IP_ALIGN); 529 skb = dev_alloc_skb(pkt_size + 2);
530 if (skb) { 530 if (skb) {
531 skb_reserve(skb, NET_IP_ALIGN); 531 skb_reserve(skb, 2);
532 skb_copy_to_linear_data(skb, sk_buff[0]->data, pkt_size); 532 skb_copy_to_linear_data(skb, sk_buff[0]->data, pkt_size);
533 *sk_buff = skb; 533 *sk_buff = skb;
534 sis190_give_to_asic(desc, rx_buf_sz); 534 sis190_give_to_asic(desc, rx_buf_sz);