Commit 6a4c8615 authored by David S. Miller's avatar David S. Miller

[NET]: Kill skb_linearize() and bogus feature flag settings in eth1394.c

parent 115f8aaa
...@@ -390,7 +390,7 @@ static int ether1394_init_dev (struct net_device *dev) ...@@ -390,7 +390,7 @@ static int ether1394_init_dev (struct net_device *dev)
/* Some constants */ /* Some constants */
dev->watchdog_timeo = ETHER1394_TIMEOUT; dev->watchdog_timeo = ETHER1394_TIMEOUT;
dev->flags = IFF_BROADCAST; /* | IFF_MULTICAST someday */ dev->flags = IFF_BROADCAST; /* | IFF_MULTICAST someday */
dev->features = NETIF_F_NO_CSUM|NETIF_F_SG|NETIF_F_HIGHDMA|NETIF_F_FRAGLIST; dev->features = NETIF_F_HIGHDMA;
dev->addr_len = ETH1394_ALEN; dev->addr_len = ETH1394_ALEN;
dev->hard_header_len = ETH1394_HLEN; dev->hard_header_len = ETH1394_HLEN;
dev->type = ARPHRD_IEEE1394; dev->type = ARPHRD_IEEE1394;
...@@ -1424,12 +1424,6 @@ static int ether1394_tx (struct sk_buff *skb, struct net_device *dev) ...@@ -1424,12 +1424,6 @@ static int ether1394_tx (struct sk_buff *skb, struct net_device *dev)
struct packet_task *ptask; struct packet_task *ptask;
struct node_entry *ne; struct node_entry *ne;
if (skb_is_nonlinear(skb)) {
ret = skb_linearize(skb, kmflags);
if(ret)
goto fail;
}
ptask = kmem_cache_alloc(packet_task_cache, kmflags); ptask = kmem_cache_alloc(packet_task_cache, kmflags);
if(ptask == NULL) { if(ptask == NULL) {
ret = -ENOMEM; ret = -ENOMEM;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment