History

Backmerge tag 'v4.9-rc4' into drm-next

Linux 4.9-rc4 This is needed for nouveau development.

Dave Airlie committed 10 years ago

Commit 7b624ad2 parents dc345c4 bc33b0c723 files · +8222 −5459Browse files

Showing the changes to include/uapi (2 of 723 files). Show all

Unified · Split

2 files
  1. include/uapi/linux/ethtool.h +1 −2
  2. include/uapi/linux/rtnetlink.h +1 −1
include/uapi/linux/ethtool.h+1−2
@@ -119,8 +119,7 @@ struct ethtool_cmd { · 118 unmodified lines
119119 static inline void ethtool_cmd_speed_set(struct ethtool_cmd *ep,
120120 __u32 speed)
121121 {
122−
123− ep->speed = (__u16)speed;
122+ ep->speed = (__u16)(speed & 0xFFFF);
124123 ep->speed_hi = (__u16)(speed >> 16);
125124 }
126125
include/uapi/linux/rtnetlink.h+1−1
@@ -350,7 +350,7 @@ struct rtnexthop { · 349 unmodified lines
350350 #define RTNH_F_OFFLOAD 8 /* offloaded route */
351351 #define RTNH_F_LINKDOWN 16 /* carrier-down on nexthop */
352352
353−#define RTNH_COMPARE_MASK (RTNH_F_DEAD | RTNH_F_LINKDOWN)
353+#define RTNH_COMPARE_MASK (RTNH_F_DEAD | RTNH_F_LINKDOWN | RTNH_F_OFFLOAD)
354354
355355 /* Macros to handle hexthops */
356356

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t