Skip to content

Commit 4b2e693

Browse files
jk-ozlabsdavem330
authored andcommitted
mctp: Add initial driver infrastructure
Add an empty drivers/net/mctp/, for future interface drivers. Signed-off-by: Jeremy Kerr <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 60fc639 commit 4b2e693

File tree

6 files changed

+13
-0
lines changed

6 files changed

+13
-0
lines changed

MAINTAINERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11037,6 +11037,7 @@ M: Jeremy Kerr <[email protected]>
1103711037
M: Matt Johnston <[email protected]>
1103811038
1103911039
S: Maintained
11040+
F: drivers/net/mctp/
1104011041
F: include/net/mctp.h
1104111042
F: net/mctp/
1104211043

drivers/net/Kconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -483,6 +483,8 @@ config NET_SB1000
483483

484484
source "drivers/net/phy/Kconfig"
485485

486+
source "drivers/net/mctp/Kconfig"
487+
486488
source "drivers/net/mdio/Kconfig"
487489

488490
source "drivers/net/pcs/Kconfig"

drivers/net/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ obj-$(CONFIG_WAN) += wan/
6969
obj-$(CONFIG_WLAN) += wireless/
7070
obj-$(CONFIG_IEEE802154) += ieee802154/
7171
obj-$(CONFIG_WWAN) += wwan/
72+
obj-$(CONFIG_MCTP) += mctp/
7273

7374
obj-$(CONFIG_VMXNET3) += vmxnet3/
7475
obj-$(CONFIG_XEN_NETDEV_FRONTEND) += xen-netfront.o

drivers/net/mctp/Kconfig

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
2+
if MCTP
3+
4+
menu "MCTP Device Drivers"
5+
6+
endmenu
7+
8+
endif

drivers/net/mctp/Makefile

Whitespace-only changes.

include/uapi/linux/if_arp.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
#define ARPHRD_X25 271 /* CCITT X.25 */
5555
#define ARPHRD_HWX25 272 /* Boards with X.25 in firmware */
5656
#define ARPHRD_CAN 280 /* Controller Area Network */
57+
#define ARPHRD_MCTP 290
5758
#define ARPHRD_PPP 512
5859
#define ARPHRD_CISCO 513 /* Cisco HDLC */
5960
#define ARPHRD_HDLC ARPHRD_CISCO

0 commit comments

Comments
 (0)