From e3d5fa4b1d5fbf0f1b120bffc1a843e7412c280f Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Fri, 20 Mar 2009 19:35:59 +0000 Subject: [PATCH] --- yaml --- r: 135407 b: refs/heads/master c: b5556498b60a237cca173dfd60109f3504ce25ca h: refs/heads/master i: 135405: 32ed87a2ec2e6446512987ff83ba5a6e6422d04d 135403: 5e180f53fafa00560aae50f74266dd82810d7b42 135399: 7d69fd22642f35695fd5fb9fb9254809fc755e43 135391: 6a37b097be1c91dc9e557448d8fabaeddaacdbb4 v: v3 --- [refs] | 2 +- trunk/drivers/usb/gadget/rndis.c | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 66589e8582d1..352c20eadce7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 63e77b391f7230ab87effbcaf7238e9b1e6d7404 +refs/heads/master: b5556498b60a237cca173dfd60109f3504ce25ca diff --git a/trunk/drivers/usb/gadget/rndis.c b/trunk/drivers/usb/gadget/rndis.c index d2860a823680..2b4660e08c4d 100644 --- a/trunk/drivers/usb/gadget/rndis.c +++ b/trunk/drivers/usb/gadget/rndis.c @@ -170,7 +170,7 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len, int i, count; rndis_query_cmplt_type *resp; struct net_device *net; - struct net_device_stats *stats; + const struct net_device_stats *stats; if (!r) return -ENOMEM; resp = (rndis_query_cmplt_type *) r->buf; @@ -193,10 +193,7 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len, resp->InformationBufferOffset = cpu_to_le32 (16); net = rndis_per_dev_params[configNr].dev; - if (net->get_stats) - stats = net->get_stats(net); - else - stats = NULL; + stats = dev_get_stats(net); switch (OID) {