Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cbbd14a9 authored by Andrzej Pietrasiewicz's avatar Andrzej Pietrasiewicz Committed by Felipe Balbi
Browse files

usb: gadget: rndis: convert into module 



In order to convert to configfs the usb functions need to be converted
to a new interface and compiled as modules. This patch creates an rndis
module which will be used by the new functions. After all users of
f_rndis are converted to the new interface, this module can be
merged with f_rndis module.

Acked-by: default avatarMichal Nazarewicz <mina86@mina86.com>
Signed-off-by: default avatarAndrzej Pietrasiewicz <andrzej.p@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent f1a1823f

drivers/usb/gadget/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -502,6 +502,9 @@ config USB_U_SERIAL 
config USB_U_ETHER

	tristate



config USB_U_RNDIS

	tristate



config USB_F_SERIAL

	tristate
@@ -599,6 +602,7 @@ config USB_ETH 
	depends on NET

	select USB_LIBCOMPOSITE

	select USB_U_ETHER

	select USB_U_RNDIS

	select CRC32

	help

	  This driver implements Ethernet style communication, in one of
@@ -724,6 +728,7 @@ config USB_FUNCTIONFS_RNDIS 
	bool "Include configuration with RNDIS (Ethernet)"

	depends on USB_FUNCTIONFS && NET

	select USB_U_ETHER

	select USB_U_RNDIS

	help

	  Include a configuration with RNDIS function (Ethernet) and the Filesystem.
@@ -871,6 +876,7 @@ config USB_G_MULTI 
	select USB_LIBCOMPOSITE

	select USB_U_SERIAL

	select USB_U_ETHER

	select USB_U_RNDIS

	select USB_F_ACM

	help

	  The Multifunction Composite Gadget provides Ethernet (RNDIS

drivers/usb/gadget/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -46,6 +46,8 @@ obj-$(CONFIG_USB_F_SERIAL) += usb_f_serial.o 
usb_f_obex-y			:= f_obex.o

obj-$(CONFIG_USB_F_OBEX)	+= usb_f_obex.o

obj-$(CONFIG_USB_U_ETHER)	+= u_ether.o

u_rndis-y			:= rndis.o

obj-$(CONFIG_USB_U_RNDIS)	+= u_rndis.o



#

# USB gadget drivers

drivers/usb/gadget/ether.c

+3 −1
Original line number Diff line number Diff line
@@ -91,6 +91,8 @@ static inline bool has_rndis(void) 
#endif

}



#include <linux/module.h>



/*-------------------------------------------------------------------------*/



/*
@@ -104,7 +106,7 @@ static inline bool has_rndis(void) 
#include "f_subset.c"

#ifdef	USB_ETH_RNDIS

#include "f_rndis.c"

#include "rndis.c"

#include "rndis.h"

#endif

#include "f_eem.c"

drivers/usb/gadget/g_ffs.c

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
#  include "f_subset.c"

#  ifdef USB_ETH_RNDIS

#    include "f_rndis.c"

#    include "rndis.c"

#    include "rndis.h"

#  endif

#  include "u_ether.h"

drivers/usb/gadget/multi.c

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ MODULE_LICENSE("GPL"); 
#include "f_subset.c"

#ifdef USB_ETH_RNDIS

#  include "f_rndis.c"

#  include "rndis.c"

#  include "rndis.h"

#endif

#include "u_ether.h"