tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 'wimax-2.6.35.y' of git://git.kernel.org/pub/scm/linux/kernel/git/inaky/wimax

David S. Miller 7466a384 a261af92

+2 -2
unified split
+2 -2
drivers/net/wimax/i2400m/rx.c
··· 1027 ro_sn = (reorder >> I2400M_RO_SN_SHIFT) & I2400M_RO_SN; 1028 1029 spin_lock_irqsave(&i2400m->rx_lock, flags); 1030 - roq = &i2400m->rx_roq[ro_cin]; 1031 - if (roq == NULL) { 1032 kfree_skb(skb); /* rx_roq is already destroyed */ 1033 spin_unlock_irqrestore(&i2400m->rx_lock, flags); 1034 goto error; 1035 } 1036 kref_get(&i2400m->rx_roq_refcount); 1037 spin_unlock_irqrestore(&i2400m->rx_lock, flags); 1038
··· 1027 ro_sn = (reorder >> I2400M_RO_SN_SHIFT) & I2400M_RO_SN; 1028 1029 spin_lock_irqsave(&i2400m->rx_lock, flags); 1030 + if (i2400m->rx_roq == NULL) { 1031 kfree_skb(skb); /* rx_roq is already destroyed */ 1032 spin_unlock_irqrestore(&i2400m->rx_lock, flags); 1033 goto error; 1034 } 1035 + roq = &i2400m->rx_roq[ro_cin]; 1036 kref_get(&i2400m->rx_roq_refcount); 1037 spin_unlock_irqrestore(&i2400m->rx_lock, flags); 1038