lkml.org 
[lkml]   [2018]   [Mar]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 61/75] staging: ks7010: Remove trailing _t from 'struct wpa_key_t'.
    Date
    The "_t" suffix is not needed for structure names in this driver, and is a
    reflection of an older typedef system that is no longer in place. Replace
    all occurences of 'struct wpa_key_t' with 'struct wpa_key'.

    Signed-off-by: Quytelda Kahja <quytelda@tamalin.org>
    ---
    drivers/staging/ks7010/ks_hostif.c | 2 +-
    drivers/staging/ks7010/ks_wlan.h | 4 ++--
    drivers/staging/ks7010/ks_wlan_net.c | 2 +-
    3 files changed, 4 insertions(+), 4 deletions(-)

    diff --git a/drivers/staging/ks7010/ks_hostif.c b/drivers/staging/ks7010/ks_hostif.c
    index 0e6f9e954a36..d8b40fd83b6b 100644
    --- a/drivers/staging/ks7010/ks_hostif.c
    +++ b/drivers/staging/ks7010/ks_hostif.c
    @@ -318,7 +318,7 @@ int hostif_data_indication_wpa(struct ks_wlan_private *priv,
    struct michael_mic_t michael_mic;
    union iwreq_data wrqu;
    unsigned int key_index = auth_type - 1;
    - struct wpa_key_t *key = &priv->wpa.key[key_index];
    + struct wpa_key *key = &priv->wpa.key[key_index];

    eth_hdr = (struct ether_hdr *)(priv->rxp);
    eth_proto = ntohs(eth_hdr->h_proto);
    diff --git a/drivers/staging/ks7010/ks_wlan.h b/drivers/staging/ks7010/ks_wlan.h
    index ece9950ba893..2458dbba66a0 100644
    --- a/drivers/staging/ks7010/ks_wlan.h
    +++ b/drivers/staging/ks7010/ks_wlan.h
    @@ -339,7 +339,7 @@ enum {

    #define MIC_KEY_SIZE 8

    -struct wpa_key_t {
    +struct wpa_key {
    u32 ext_flags; /* IW_ENCODE_EXT_xxx */
    u8 tx_seq[IW_ENCODE_SEQ_MAX_SIZE]; /* LSB first */
    u8 rx_seq[IW_ENCODE_SEQ_MAX_SIZE]; /* LSB first */
    @@ -373,7 +373,7 @@ struct wpa_status_t {
    int key_mgmt_suite; /* authentication key management suite */
    int auth_alg;
    int txkey;
    - struct wpa_key_t key[WPA_KEY_INDEX_MAX];
    + struct wpa_key key[WPA_KEY_INDEX_MAX];
    struct scan_ext scan_ext;
    struct mic_failure_t mic_failure;
    };
    diff --git a/drivers/staging/ks7010/ks_wlan_net.c b/drivers/staging/ks7010/ks_wlan_net.c
    index a4f10bec865f..1b8234720d78 100644
    --- a/drivers/staging/ks7010/ks_wlan_net.c
    +++ b/drivers/staging/ks7010/ks_wlan_net.c
    @@ -1706,7 +1706,7 @@ static int ks_wlan_set_encode_ext(struct net_device *dev,
    struct iw_encode_ext *enc;
    int index = dwrq->flags & IW_ENCODE_INDEX;
    unsigned int commit = 0;
    - struct wpa_key_t *key;
    + struct wpa_key *key;

    enc = (struct iw_encode_ext *)extra;
    if (!enc)
    --
    2.16.3
    \
     
     \ /
      Last update: 2018-03-31 08:13    [W:4.148 / U:0.128 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site