Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / atm / solos-pci.c

diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c
index 0474a89170b9cc0d969f4917dd889ae7a0a679bb..32784d18d1f7c321fd88421aba83551fd4463b4d 100644 (file)
--- a/drivers/atm/solos-pci.c
+++ b/drivers/atm/solos-pci.c
@@ -896,12 +896,11 @@ static struct atm_vcc *find_vcc(struct atm_dev *dev, short vpi, int vci)
 {
        struct hlist_head *head;
        struct atm_vcc *vcc = NULL;
-       struct hlist_node *node;
        struct sock *s;
 
        read_lock(&vcc_sklist_lock);
        head = &vcc_hash[vci & (VCC_HTABLE_SIZE -1)];
-       sk_for_each(s, node, head) {
+       sk_for_each(s, head) {
                vcc = atm_sk(s);
                if (vcc->dev == dev && vcc->vci == vci &&
                    vcc->vpi == vpi && vcc->qos.rxtp.traffic_class != ATM_NONE &&