Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=53f374e76c2b37835966382b27efb6bb3715f9d8
Commit: 53f374e76c2b37835966382b27efb6bb3715f9d8
Parent: 099398719bb53119734354bc079840bebf1c7386
Author: Stefan Richter <[EMAIL PROTECTED]>
AuthorDate: Mon Apr 2 02:23:19 2007 +0200
Committer: Stefan Richter <[EMAIL PROTECTED]>
CommitDate: Mon Apr 30 00:00:32 2007 +0200
ieee1394: eth1394: hard_start_xmit is called in atomic context
Signed-off-by: Stefan Richter <[EMAIL PROTECTED]>
---
drivers/ieee1394/eth1394.c | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/ieee1394/eth1394.c b/drivers/ieee1394/eth1394.c
index a6c4a37..b5cd107 100644
--- a/drivers/ieee1394/eth1394.c
+++ b/drivers/ieee1394/eth1394.c
@@ -1521,7 +1521,6 @@ static void ether1394_complete_cb(void *__ptask)
/* Transmit a packet (called by kernel) */
static int ether1394_tx(struct sk_buff *skb, struct net_device *dev)
{
- gfp_t kmflags = in_interrupt() ? GFP_ATOMIC : GFP_KERNEL;
struct eth1394hdr *eth;
struct eth1394_priv *priv = netdev_priv(dev);
__be16 proto;
@@ -1537,7 +1536,7 @@ static int ether1394_tx(struct sk_buff *skb, struct
net_device *dev)
struct eth1394_node_ref *node;
struct eth1394_node_info *node_info = NULL;
- ptask = kmem_cache_alloc(packet_task_cache, kmflags);
+ ptask = kmem_cache_alloc(packet_task_cache, GFP_ATOMIC);
if (ptask == NULL) {
ret = -ENOMEM;
goto fail;
@@ -1553,7 +1552,7 @@ static int ether1394_tx(struct sk_buff *skb, struct
net_device *dev)
}
#endif
- skb = skb_share_check(skb, kmflags);
+ skb = skb_share_check(skb, GFP_ATOMIC);
if (!skb) {
ret = -ENOMEM;
goto fail;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
