lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of github.com:davem330/net

Browse Source 
Conflicts:
	net/batman-adv/soft-interface.c
This commit is contained in:
David S. Miller
2011-10-07 13:38:43 -04:00
parent 8083f0fc96 3ee72ca992
commit 88c5100c28
178 changed files with 1255 additions and 1000 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/scsi/cxgbi/cxgb3i/cxgb3i.c
View File

@@ -913,7 +913,7 @@ static void l2t_put(struct cxgbi_sock *csk)
struct t3cdev *t3dev = (struct t3cdev *)csk->cdev->lldev;
if (csk->l2t) {
l2t_release(L2DATA(t3dev), csk->l2t);
l2t_release(t3dev, csk->l2t);
csk->l2t = NULL;
cxgbi_sock_put(csk);
}