linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / net / sis190.c

diff --git a/drivers/net/sis190.c b/drivers/net/sis190.c
index df0cbeb..ed4bc91 100644 (file)
--- a/drivers/net/sis190.c
+++ b/drivers/net/sis190.c
@@ -366,7 +366,7 @@ static const u32 sis190_intr_mask =
  * Maximum number of multicast addresses to filter (vs. Rx-all-multicast).
  * The chips use a 64 element hash table based on the Ethernet CRC.
  */
-static const int multicast_filter_limit = 32;
+static int multicast_filter_limit = 32;
 
 static void __mdio_cmd(void __iomem *ioaddr, u32 ctl)
 {
@@ -1054,7 +1054,7 @@ static int sis190_open(struct net_device *dev)
 
        sis190_request_timer(dev);
 
-       rc = request_irq(dev->irq, sis190_interrupt, IRQF_SHARED, dev->name, dev);
+       rc = request_irq(dev->irq, sis190_interrupt, SA_SHIRQ, dev->name, dev);
        if (rc < 0)
                goto err_release_timer_2;
 
@@ -1156,7 +1156,8 @@ static int sis190_start_xmit(struct sk_buff *skb, struct net_device *dev)
        dma_addr_t mapping;
 
        if (unlikely(skb->len < ETH_ZLEN)) {
-               if (skb_padto(skb, ETH_ZLEN)) {
+               skb = skb_padto(skb, ETH_ZLEN);
+               if (!skb) {
                        tp->stats.tx_dropped++;
                        goto out;
                }