From: Andrew Morton <akpm@linux-foundation.org>

Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/net/netxen/netxen_nic_init.c |    2 ++
 1 file changed, 2 insertions(+)

diff -puN drivers/net/netxen/netxen_nic_init.c~git-netdev-all-fix-conflicts-fix drivers/net/netxen/netxen_nic_init.c
--- a/drivers/net/netxen/netxen_nic_init.c~git-netdev-all-fix-conflicts-fix
+++ a/drivers/net/netxen/netxen_nic_init.c
@@ -1279,6 +1279,8 @@ int netxen_process_cmd_ring(unsigned lon
 	spin_unlock(&adapter->tx_lock);
 
 	while ((last_consumer != consumer) && (count1 < MAX_STATUS_HANDLE)) {
+		struct sk_buff *skb;
+
 		buffer = &adapter->cmd_buf_arr[last_consumer];
 		pdev = adapter->pdev;
 		frag = &buffer->frag_array[0];
_