* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [TG3]: Update driver version and reldate. [TG3]: Add 5755 nvram support [TG3]: Add 5755 support [IPV6]: ip6_xmit: remove unnecessary NULL ptr check [NET_SCHED]: cls_u32: remove unnecessary NULL-ptr check [IPV4]: Add fib rule netlink notifications [BNX2]: Update version and reldate [BNX2]: Separate tx producer and consumer fields [BNX2]: Move .h files to bnx2.c [BNX2]: Combine small mem allocations [BNX2]: Fix link change handling [PKTGEN]: Add MPLS extension.
Showing the changes to include (2 of 11 files). Show all
Unified · Split
| @@ -1864,11 +1864,13 @@ · 1863 unmodified lines | ||
| 1864 | 1864 | #define PCI_DEVICE_ID_TIGON3_5780S 0x166b |
| 1865 | 1865 | #define PCI_DEVICE_ID_TIGON3_5705F 0x166e |
| 1866 | 1866 | #define PCI_DEVICE_ID_TIGON3_5754M 0x1672 |
| 1867 | +#define PCI_DEVICE_ID_TIGON3_5755M 0x1673 | |
| 1867 | 1868 | #define PCI_DEVICE_ID_TIGON3_5750 0x1676 |
| 1868 | 1869 | #define PCI_DEVICE_ID_TIGON3_5751 0x1677 |
| 1869 | 1870 | #define PCI_DEVICE_ID_TIGON3_5715 0x1678 |
| 1870 | 1871 | #define PCI_DEVICE_ID_TIGON3_5715S 0x1679 |
| 1871 | 1872 | #define PCI_DEVICE_ID_TIGON3_5754 0x167a |
| 1873 | +#define PCI_DEVICE_ID_TIGON3_5755 0x167b | |
| 1872 | 1874 | #define PCI_DEVICE_ID_TIGON3_5750M 0x167c |
| 1873 | 1875 | #define PCI_DEVICE_ID_TIGON3_5751M 0x167d |
| 1874 | 1876 | #define PCI_DEVICE_ID_TIGON3_5751F 0x167e |
| @@ -839,6 +839,7 @@ enum · 838 unmodified lines | ||
| 839 | 839 | #define RTMGRP_IPV4_IFADDR 0x10 |
| 840 | 840 | #define RTMGRP_IPV4_MROUTE 0x20 |
| 841 | 841 | #define RTMGRP_IPV4_ROUTE 0x40 |
| 842 | +#define RTMGRP_IPV4_RULE 0x80 | |
| 842 | 843 | |
| 843 | 844 | #define RTMGRP_IPV6_IFADDR 0x100 |
| 844 | 845 | #define RTMGRP_IPV6_MROUTE 0x200 |
| @@ -869,7 +870,8 @@ enum rtnetlink_groups { · 24 unmodified lines | ||
| 869 | 870 | #define RTNLGRP_IPV4_MROUTE RTNLGRP_IPV4_MROUTE |
| 870 | 871 | RTNLGRP_IPV4_ROUTE, |
| 871 | 872 | #define RTNLGRP_IPV4_ROUTE RTNLGRP_IPV4_ROUTE |
| 872 | − RTNLGRP_NOP1, | |
| 873 | + RTNLGRP_IPV4_RULE, | |
| 874 | +#define RTNLGRP_IPV4_RULE RTNLGRP_IPV4_RULE | |
| 873 | 875 | RTNLGRP_IPV6_IFADDR, |
| 874 | 876 | #define RTNLGRP_IPV6_IFADDR RTNLGRP_IPV6_IFADDR |
| 875 | 877 | RTNLGRP_IPV6_MROUTE, |