diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2011-03-01 18:20:20 -0500 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2011-03-01 18:20:20 -0500 |
| commit | 8d3c3ddfa85837e24fad6fa39318617cbb59e843 (patch) | |
| tree | f699dcaac2a11f0c9506ad111ae39fd5e3617c2d /include/linux/dcbnl.h | |
| parent | e8b2c3c47a53348aebbbeb5322e32937df958793 (diff) | |
| parent | 6927faf30920b8c03dfa007e732642a1f1f20089 (diff) | |
Merge branch 'drm-intel-fixes' into drm-intel-next
Diffstat (limited to 'include/linux/dcbnl.h')
| -rw-r--r-- | include/linux/dcbnl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/dcbnl.h b/include/linux/dcbnl.h index 68cd248f6d3e..66900e3c6eb1 100644 --- a/include/linux/dcbnl.h +++ b/include/linux/dcbnl.h | |||
| @@ -101,8 +101,8 @@ struct ieee_pfc { | |||
| 101 | */ | 101 | */ |
| 102 | struct dcb_app { | 102 | struct dcb_app { |
| 103 | __u8 selector; | 103 | __u8 selector; |
| 104 | __u32 protocol; | ||
| 105 | __u8 priority; | 104 | __u8 priority; |
| 105 | __u16 protocol; | ||
| 106 | }; | 106 | }; |
| 107 | 107 | ||
| 108 | struct dcbmsg { | 108 | struct dcbmsg { |