Merge branches 'release', 'cpuidle-2.6.25' and 'idle' into release

[mv-sheeva.git] / drivers / net / sgiseeq.c

diff --git a/drivers/net/sgiseeq.c b/drivers/net/sgiseeq.c
index c69bb8ba8b643e48819beffb33cf22221165d7fd..78994ede0cb0666945dc3d35e1061b1cc3cc8aee 100644 (file)
--- a/drivers/net/sgiseeq.c
+++ b/drivers/net/sgiseeq.c
@@ -193,7 +193,7 @@ static int seeq_init_ring(struct net_device *dev)
 
        /* And now the rx ring. */
        for (i = 0; i < SEEQ_RX_BUFFERS; i++) {
-               if (!sp->rx_desc[i].rdma.pbuf) {
+               if (!sp->rx_desc[i].skb) {
                        dma_addr_t dma_addr;
                        struct sk_buff *skb = netdev_alloc_skb(dev, PKT_BUF_SZ);