diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-06-19 20:33:16 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-06-19 20:34:58 -0400 |
commit | 95edd09ec3b15b165e2c7ba1e54cc508eafb2321 (patch) | |
tree | 7fb38c96bdc89f409e0ba5afcf1a703b01c482ca /drivers/staging/csr/csr_wifi_router_ctrl_free_upstream_contents.c | |
parent | 635d2b00e5070378e7bf812acf47fb135c6ab928 (diff) |
Staging: csr: update to version 5.1.0 of the driver
This brings the in-kernel driver up to the level of the
csr-linux-wifi-5.1.0-oss.tar.gz tarball.
Cc: Mikko Virkkilä <mikko.virkkila@bluegiga.com>
Cc: Lauri Hintsala <Lauri.Hintsala@bluegiga.com>
Cc: Riku Mettälä <riku.mettala@bluegiga.com>
Cc: Veli-Pekka Peltola <veli-pekka.peltola@bluegiga.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/csr/csr_wifi_router_ctrl_free_upstream_contents.c')
-rw-r--r-- | drivers/staging/csr/csr_wifi_router_ctrl_free_upstream_contents.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/drivers/staging/csr/csr_wifi_router_ctrl_free_upstream_contents.c b/drivers/staging/csr/csr_wifi_router_ctrl_free_upstream_contents.c index 25e327357a3..b6bf11d566d 100644 --- a/drivers/staging/csr/csr_wifi_router_ctrl_free_upstream_contents.c +++ b/drivers/staging/csr/csr_wifi_router_ctrl_free_upstream_contents.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /***************************************************************************** | 1 | /***************************************************************************** |
2 | 2 | ||
3 | (c) Cambridge Silicon Radio Limited 2011 | 3 | (c) Cambridge Silicon Radio Limited 2012 |
4 | All rights reserved and confidential information of CSR | 4 | All rights reserved and confidential information of CSR |
5 | 5 | ||
6 | Refer to LICENSE.txt included with this source for details | 6 | Refer to LICENSE.txt included with this source for details |
@@ -63,15 +63,22 @@ void CsrWifiRouterCtrlFreeUpstreamMessageContents(CsrUint16 eventClass, void *me | |||
63 | p->versions.routerBuild = NULL; | 63 | p->versions.routerBuild = NULL; |
64 | break; | 64 | break; |
65 | } | 65 | } |
66 | case CSR_WIFI_ROUTER_CTRL_WAPI_MULTICAST_IND: | 66 | case CSR_WIFI_ROUTER_CTRL_WAPI_RX_MIC_CHECK_IND: |
67 | { | 67 | { |
68 | CsrWifiRouterCtrlWapiMulticastInd *p = (CsrWifiRouterCtrlWapiMulticastInd *)message; | 68 | CsrWifiRouterCtrlWapiRxMicCheckInd *p = (CsrWifiRouterCtrlWapiRxMicCheckInd *)message; |
69 | CsrPmemFree(p->signal); | 69 | CsrPmemFree(p->signal); |
70 | p->signal = NULL; | 70 | p->signal = NULL; |
71 | CsrPmemFree(p->data); | 71 | CsrPmemFree(p->data); |
72 | p->data = NULL; | 72 | p->data = NULL; |
73 | break; | 73 | break; |
74 | } | 74 | } |
75 | case CSR_WIFI_ROUTER_CTRL_WAPI_UNICAST_TX_ENCRYPT_IND: | ||
76 | { | ||
77 | CsrWifiRouterCtrlWapiUnicastTxEncryptInd *p = (CsrWifiRouterCtrlWapiUnicastTxEncryptInd *)message; | ||
78 | CsrPmemFree(p->data); | ||
79 | p->data = NULL; | ||
80 | break; | ||
81 | } | ||
75 | 82 | ||
76 | default: | 83 | default: |
77 | break; | 84 | break; |