lkml.org 
[lkml]   [2012]   [Jun]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[ 07/20] net: sierra_net: device IDs for Aircard 320U++
    3.0-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Bjørn Mork <bjorn@mork.no>

    commit dd03cff23d694cfb0fdae80cb618e7ced05ea696 upstream.

    Adding device IDs for Aircard 320U and two other devices
    found in the out-of-tree version of this driver.

    Cc: linux@sierrawireless.com
    Cc: Autif Khan <autif.mlist@gmail.com>
    Cc: Tom Cassidy <tomas.cassidy@gmail.com>
    Signed-off-by: Bjørn Mork <bjorn@mork.no>
    Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/net/usb/sierra_net.c | 14 ++++++++++----
    1 file changed, 10 insertions(+), 4 deletions(-)

    --- a/drivers/net/usb/sierra_net.c
    +++ b/drivers/net/usb/sierra_net.c
    @@ -943,7 +943,7 @@ struct sk_buff *sierra_net_tx_fixup(stru
    }

    static const u8 sierra_net_ifnum_list[] = { 7, 10, 11 };
    -static const struct sierra_net_info_data sierra_net_info_data_68A3 = {
    +static const struct sierra_net_info_data sierra_net_info_data_direct_ip = {
    .rx_urb_size = 8 * 1024,
    .whitelist = {
    .infolen = ARRAY_SIZE(sierra_net_ifnum_list),
    @@ -951,7 +951,7 @@ static const struct sierra_net_info_data
    }
    };

    -static const struct driver_info sierra_net_info_68A3 = {
    +static const struct driver_info sierra_net_info_direct_ip = {
    .description = "Sierra Wireless USB-to-WWAN Modem",
    .flags = FLAG_WWAN | FLAG_SEND_ZLP,
    .bind = sierra_net_bind,
    @@ -959,12 +959,18 @@ static const struct driver_info sierra_n
    .status = sierra_net_status,
    .rx_fixup = sierra_net_rx_fixup,
    .tx_fixup = sierra_net_tx_fixup,
    - .data = (unsigned long)&sierra_net_info_data_68A3,
    + .data = (unsigned long)&sierra_net_info_data_direct_ip,
    };

    static const struct usb_device_id products[] = {
    {USB_DEVICE(0x1199, 0x68A3), /* Sierra Wireless USB-to-WWAN modem */
    - .driver_info = (unsigned long) &sierra_net_info_68A3},
    + .driver_info = (unsigned long) &sierra_net_info_direct_ip},
    + {USB_DEVICE(0x0F3D, 0x68A3), /* AT&T Direct IP modem */
    + .driver_info = (unsigned long) &sierra_net_info_direct_ip},
    + {USB_DEVICE(0x1199, 0x68AA), /* Sierra Wireless Direct IP LTE modem */
    + .driver_info = (unsigned long) &sierra_net_info_direct_ip},
    + {USB_DEVICE(0x0F3D, 0x68AA), /* AT&T Direct IP LTE modem */
    + .driver_info = (unsigned long) &sierra_net_info_direct_ip},

    {}, /* last item */
    };

    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2012-06-15 02:21    [W:4.471 / U:0.276 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site