Commit 039ee17d authored by Jussi Kivilinna's avatar Jussi Kivilinna Committed by David S. Miller

rndis_host: Add RNDIS physical medium checking into generic_rndis_bind()

Add RNDIS physical medium checking into generic_rndis_bind() and also make
rndis_host to be only bind on every medium except wireless.
Signed-off-by: default avatarJussi Kivilinna <jussi.kivilinna@mbnet.fi>
Acked-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5d6ecf6c
...@@ -271,7 +271,8 @@ response_error: ...@@ -271,7 +271,8 @@ response_error:
return -EDOM; return -EDOM;
} }
int generic_rndis_bind(struct usbnet *dev, struct usb_interface *intf) int
generic_rndis_bind(struct usbnet *dev, struct usb_interface *intf, int flags)
{ {
int retval; int retval;
struct net_device *net = dev->net; struct net_device *net = dev->net;
...@@ -287,7 +288,7 @@ int generic_rndis_bind(struct usbnet *dev, struct usb_interface *intf) ...@@ -287,7 +288,7 @@ int generic_rndis_bind(struct usbnet *dev, struct usb_interface *intf)
struct rndis_set_c *set_c; struct rndis_set_c *set_c;
struct rndis_halt *halt; struct rndis_halt *halt;
} u; } u;
u32 tmp; u32 tmp, *phym;
int reply_len; int reply_len;
unsigned char *bp; unsigned char *bp;
...@@ -358,6 +359,30 @@ int generic_rndis_bind(struct usbnet *dev, struct usb_interface *intf) ...@@ -358,6 +359,30 @@ int generic_rndis_bind(struct usbnet *dev, struct usb_interface *intf)
dev->driver_info->early_init(dev) != 0) dev->driver_info->early_init(dev) != 0)
goto halt_fail_and_release; goto halt_fail_and_release;
/* Check physical medium */
reply_len = sizeof *phym;
retval = rndis_query(dev, intf, u.buf, OID_GEN_PHYSICAL_MEDIUM,
0, (void **) &phym, &reply_len);
if (retval != 0)
/* OID is optional so don't fail here. */
*phym = RNDIS_PHYSICAL_MEDIUM_UNSPECIFIED;
if ((flags & FLAG_RNDIS_PHYM_WIRELESS) &&
*phym != RNDIS_PHYSICAL_MEDIUM_WIRELESS_LAN) {
if (netif_msg_probe(dev))
dev_dbg(&intf->dev, "driver requires wireless "
"physical medium, but device is not.\n");
retval = -ENODEV;
goto halt_fail_and_release;
}
if ((flags & FLAG_RNDIS_PHYM_NOT_WIRELESS) &&
*phym == RNDIS_PHYSICAL_MEDIUM_WIRELESS_LAN) {
if (netif_msg_probe(dev))
dev_dbg(&intf->dev, "driver requires non-wireless "
"physical medium, but device is wireless.\n");
retval = -ENODEV;
goto halt_fail_and_release;
}
/* Get designated host ethernet address */ /* Get designated host ethernet address */
reply_len = ETH_ALEN; reply_len = ETH_ALEN;
retval = rndis_query(dev, intf, u.buf, OID_802_3_PERMANENT_ADDRESS, retval = rndis_query(dev, intf, u.buf, OID_802_3_PERMANENT_ADDRESS,
...@@ -403,6 +428,11 @@ fail: ...@@ -403,6 +428,11 @@ fail:
} }
EXPORT_SYMBOL_GPL(generic_rndis_bind); EXPORT_SYMBOL_GPL(generic_rndis_bind);
static int rndis_bind(struct usbnet *dev, struct usb_interface *intf)
{
return generic_rndis_bind(dev, intf, FLAG_RNDIS_PHYM_NOT_WIRELESS);
}
void rndis_unbind(struct usbnet *dev, struct usb_interface *intf) void rndis_unbind(struct usbnet *dev, struct usb_interface *intf)
{ {
struct rndis_halt *halt; struct rndis_halt *halt;
...@@ -518,7 +548,7 @@ EXPORT_SYMBOL_GPL(rndis_tx_fixup); ...@@ -518,7 +548,7 @@ EXPORT_SYMBOL_GPL(rndis_tx_fixup);
static const struct driver_info rndis_info = { static const struct driver_info rndis_info = {
.description = "RNDIS device", .description = "RNDIS device",
.flags = FLAG_ETHER | FLAG_FRAMING_RN | FLAG_NO_SETINT, .flags = FLAG_ETHER | FLAG_FRAMING_RN | FLAG_NO_SETINT,
.bind = generic_rndis_bind, .bind = rndis_bind,
.unbind = rndis_unbind, .unbind = rndis_unbind,
.status = rndis_status, .status = rndis_status,
.rx_fixup = rndis_rx_fixup, .rx_fixup = rndis_rx_fixup,
......
...@@ -82,6 +82,17 @@ struct rndis_msg_hdr { ...@@ -82,6 +82,17 @@ struct rndis_msg_hdr {
#define RNDIS_STATUS_MEDIA_CONNECT ccpu2(0x4001000b) #define RNDIS_STATUS_MEDIA_CONNECT ccpu2(0x4001000b)
#define RNDIS_STATUS_MEDIA_DISCONNECT ccpu2(0x4001000c) #define RNDIS_STATUS_MEDIA_DISCONNECT ccpu2(0x4001000c)
/* codes for OID_GEN_PHYSICAL_MEDIUM */
#define RNDIS_PHYSICAL_MEDIUM_UNSPECIFIED ccpu2(0x00000000)
#define RNDIS_PHYSICAL_MEDIUM_WIRELESS_LAN ccpu2(0x00000001)
#define RNDIS_PHYSICAL_MEDIUM_CABLE_MODEM ccpu2(0x00000002)
#define RNDIS_PHYSICAL_MEDIUM_PHONE_LINE ccpu2(0x00000003)
#define RNDIS_PHYSICAL_MEDIUM_POWER_LINE ccpu2(0x00000004)
#define RNDIS_PHYSICAL_MEDIUM_DSL ccpu2(0x00000005)
#define RNDIS_PHYSICAL_MEDIUM_FIBRE_CHANNEL ccpu2(0x00000006)
#define RNDIS_PHYSICAL_MEDIUM_1394 ccpu2(0x00000007)
#define RNDIS_PHYSICAL_MEDIUM_WIRELESS_WAN ccpu2(0x00000008)
#define RNDIS_PHYSICAL_MEDIUM_MAX ccpu2(0x00000009)
struct rndis_data_hdr { struct rndis_data_hdr {
__le32 msg_type; /* RNDIS_MSG_PACKET */ __le32 msg_type; /* RNDIS_MSG_PACKET */
...@@ -222,6 +233,7 @@ struct rndis_keepalive_c { /* IN (optionally OUT) */ ...@@ -222,6 +233,7 @@ struct rndis_keepalive_c { /* IN (optionally OUT) */
#define OID_802_3_PERMANENT_ADDRESS ccpu2(0x01010101) #define OID_802_3_PERMANENT_ADDRESS ccpu2(0x01010101)
#define OID_GEN_MAXIMUM_FRAME_SIZE ccpu2(0x00010106) #define OID_GEN_MAXIMUM_FRAME_SIZE ccpu2(0x00010106)
#define OID_GEN_CURRENT_PACKET_FILTER ccpu2(0x0001010e) #define OID_GEN_CURRENT_PACKET_FILTER ccpu2(0x0001010e)
#define OID_GEN_PHYSICAL_MEDIUM ccpu2(0x00010202)
/* packet filter bits used by OID_GEN_CURRENT_PACKET_FILTER */ /* packet filter bits used by OID_GEN_CURRENT_PACKET_FILTER */
#define RNDIS_PACKET_TYPE_DIRECTED ccpu2(0x00000001) #define RNDIS_PACKET_TYPE_DIRECTED ccpu2(0x00000001)
...@@ -244,10 +256,15 @@ struct rndis_keepalive_c { /* IN (optionally OUT) */ ...@@ -244,10 +256,15 @@ struct rndis_keepalive_c { /* IN (optionally OUT) */
RNDIS_PACKET_TYPE_ALL_MULTICAST | \ RNDIS_PACKET_TYPE_ALL_MULTICAST | \
RNDIS_PACKET_TYPE_PROMISCUOUS) RNDIS_PACKET_TYPE_PROMISCUOUS)
/* Flags to require specific physical medium type for generic_rndis_bind() */
#define FLAG_RNDIS_PHYM_NOT_WIRELESS 0x0001
#define FLAG_RNDIS_PHYM_WIRELESS 0x0002
extern void rndis_status(struct usbnet *dev, struct urb *urb); extern void rndis_status(struct usbnet *dev, struct urb *urb);
extern int rndis_command(struct usbnet *dev, struct rndis_msg_hdr *buf); extern int rndis_command(struct usbnet *dev, struct rndis_msg_hdr *buf);
extern int generic_rndis_bind(struct usbnet *dev, struct usb_interface *intf); extern int
generic_rndis_bind(struct usbnet *dev, struct usb_interface *intf, int flags);
extern void rndis_unbind(struct usbnet *dev, struct usb_interface *intf); extern void rndis_unbind(struct usbnet *dev, struct usb_interface *intf);
extern int rndis_rx_fixup(struct usbnet *dev, struct sk_buff *skb); extern int rndis_rx_fixup(struct usbnet *dev, struct sk_buff *skb);
extern struct sk_buff * extern struct sk_buff *
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment