mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 11:41:38 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
r8152 conflicts are the NAPI fixes in 'net' overlapping with some tasklet stuff in net-next Signed-off-by: David S. Miller <[email protected]>
This commit is contained in:
commit
765b7590c9
226 changed files with 2169 additions and 1074 deletions
|
|
@ -28,6 +28,7 @@
|
|||
*
|
||||
* RSV - VID[9]:
|
||||
* To be used for further expansion of SWITCH_ID or for other purposes.
|
||||
* Must be transmitted as zero and ignored on receive.
|
||||
*
|
||||
* SWITCH_ID - VID[8:6]:
|
||||
* Index of switch within DSA tree. Must be between 0 and
|
||||
|
|
@ -35,6 +36,7 @@
|
|||
*
|
||||
* RSV - VID[5:4]:
|
||||
* To be used for further expansion of PORT or for other purposes.
|
||||
* Must be transmitted as zero and ignored on receive.
|
||||
*
|
||||
* PORT - VID[3:0]:
|
||||
* Index of switch port. Must be between 0 and DSA_MAX_PORTS - 1.
|
||||
|
|
|
|||
Loading…
Reference in a new issue