X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fnet%2Fsc92031.c;h=872cb1cc9c41c05d2b12048450a5b187b782608f;hb=5f08e46b621a769e52a9545a23ab1d5fb2aec1d4;hp=c32c21af3fddd767c3ca715474c29569a7bc2a59;hpb=c3474be4ddcae0256a13cbbe35d849c153c4ec4b;p=linux-2.6

diff --git a/drivers/net/sc92031.c b/drivers/net/sc92031.c
index c32c21af3f..872cb1cc9c 100644
--- a/drivers/net/sc92031.c
+++ b/drivers/net/sc92031.c
@@ -814,7 +814,6 @@ static void _sc92031_rx_tasklet(struct net_device *dev)
 			memcpy(skb_put(skb, pkt_size), rx_ring + rx_ring_offset, pkt_size);
 		}
 
-		skb->dev = dev;
 		skb->protocol = eth_type_trans(skb, dev);
 		dev->last_rx = jiffies;
 		netif_rx(skb);
@@ -1403,7 +1402,6 @@ static struct ethtool_ops sc92031_ethtool_ops = {
 	.get_strings		= sc92031_ethtool_get_strings,
 	.get_stats_count	= sc92031_ethtool_get_stats_count,
 	.get_ethtool_stats	= sc92031_ethtool_get_ethtool_stats,
-	.get_perm_addr		= ethtool_op_get_perm_addr,
 	.get_ufo		= ethtool_op_get_ufo,
 };