xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Browse Source 
Conflicts:
	drivers/net/smsc911x.c
This commit is contained in:
David S. Miller
2011-04-11 13:44:25 -07:00
parent c44d79950b 4a9f65f630
commit 1c01a80cfe
2765 changed files with 7223 additions and 8041 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/isdn/mISDN/layer2.c
View File

@@ -1864,7 +1864,7 @@ ph_data_indication(struct layer2 *l2, struct mISDNhead *hh, struct sk_buff *skb)
psapi >>= 2;
ptei >>= 1;
if (psapi != l2->sapi) {
/* not our bussiness */
/* not our business */
if (*debug & DEBUG_L2)
printk(KERN_DEBUG "%s: sapi %d/%d mismatch\n",
__func__, psapi, l2->sapi);
@@ -1872,7 +1872,7 @@ ph_data_indication(struct layer2 *l2, struct mISDNhead *hh, struct sk_buff *skb)
return 0;
}
if ((ptei != l2->tei) && (ptei != GROUP_TEI)) {
/* not our bussiness */
/* not our business */
if (*debug & DEBUG_L2)
printk(KERN_DEBUG "%s: tei %d/%d mismatch\n",
__func__, ptei, l2->tei);