lkml.org 
[lkml]   [2008]   [Jul]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 08/12] ipwireless: Constify buffer variables
    Date
    Signed-off-by: David Sterba <dsterba@suse.cz>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>
    ---

    drivers/char/pcmcia/ipwireless/hardware.c | 26 ++++++++++++++------------
    drivers/char/pcmcia/ipwireless/hardware.h | 2 +-
    drivers/char/pcmcia/ipwireless/tty.c | 2 +-
    3 files changed, 16 insertions(+), 14 deletions(-)

    diff --git a/drivers/char/pcmcia/ipwireless/hardware.c b/drivers/char/pcmcia/ipwireless/hardware.c
    index ff2093d..814ea32 100644
    --- a/drivers/char/pcmcia/ipwireless/hardware.c
    +++ b/drivers/char/pcmcia/ipwireless/hardware.c
    @@ -30,11 +30,11 @@
    static void ipw_send_setup_packet(struct ipw_hardware *hw);
    static void handle_received_SETUP_packet(struct ipw_hardware *ipw,
    unsigned int address,
    - unsigned char *data, int len,
    + const unsigned char *data, int len,
    int is_last);
    static void ipwireless_setup_timer(unsigned long data);
    static void handle_received_CTRL_packet(struct ipw_hardware *hw,
    - unsigned int channel_idx, unsigned char *data, int len);
    + unsigned int channel_idx, const unsigned char *data, int len);

    /*#define TIMING_DIAGNOSTICS*/

    @@ -615,8 +615,10 @@ static void pool_free(struct ipw_hardware *hw, struct ipw_rx_packet *packet)
    }

    static void queue_received_packet(struct ipw_hardware *hw,
    - unsigned int protocol, unsigned int address,
    - unsigned char *data, int length, int is_last)
    + unsigned int protocol,
    + unsigned int address,
    + const unsigned char *data, int length,
    + int is_last)
    {
    unsigned int channel_idx = address - 1;
    struct ipw_rx_packet *packet = NULL;
    @@ -760,10 +762,10 @@ static void ipw_receive_data_work(struct work_struct *work_rx)

    static void handle_received_CTRL_packet(struct ipw_hardware *hw,
    unsigned int channel_idx,
    - unsigned char *data, int len)
    + const unsigned char *data, int len)
    {
    - struct ipw_control_packet_body *body =
    - (struct ipw_control_packet_body *) data;
    + const struct ipw_control_packet_body *body =
    + (const struct ipw_control_packet_body *) data;
    unsigned int changed_mask;

    if (len != sizeof(struct ipw_control_packet_body)) {
    @@ -805,13 +807,13 @@ static void handle_received_CTRL_packet(struct ipw_hardware *hw,
    }

    static void handle_received_packet(struct ipw_hardware *hw,
    - union nl_packet *packet,
    + const union nl_packet *packet,
    unsigned short len)
    {
    unsigned int protocol = packet->hdr.protocol;
    unsigned int address = packet->hdr.address;
    unsigned int header_length;
    - unsigned char *data;
    + const unsigned char *data;
    unsigned int data_len;
    int is_last = packet->hdr.packet_rank & NL_LAST_PACKET;

    @@ -1288,7 +1290,7 @@ static void *alloc_ctrl_packet(int header_size,
    }

    int ipwireless_send_packet(struct ipw_hardware *hw, unsigned int channel_idx,
    - unsigned char *data, unsigned int length,
    + const unsigned char *data, unsigned int length,
    void (*callback) (void *cb, unsigned int length),
    void *callback_data)
    {
    @@ -1522,10 +1524,10 @@ static void ipw_send_setup_packet(struct ipw_hardware *hw)

    static void handle_received_SETUP_packet(struct ipw_hardware *hw,
    unsigned int address,
    - unsigned char *data, int len,
    + const unsigned char *data, int len,
    int is_last)
    {
    - union ipw_setup_rx_msg *rx_msg = (union ipw_setup_rx_msg *) data;
    + const union ipw_setup_rx_msg *rx_msg = (const union ipw_setup_rx_msg *) data;

    if (address != ADDR_SETUP_PROT) {
    printk(KERN_INFO IPWIRELESS_PCCARD_NAME
    diff --git a/drivers/char/pcmcia/ipwireless/hardware.h b/drivers/char/pcmcia/ipwireless/hardware.h
    index e21d23a..90a8590 100644
    --- a/drivers/char/pcmcia/ipwireless/hardware.h
    +++ b/drivers/char/pcmcia/ipwireless/hardware.h
    @@ -41,7 +41,7 @@ int ipwireless_set_RTS(struct ipw_hardware *hw, unsigned int channel_idx,
    int state);
    int ipwireless_send_packet(struct ipw_hardware *hw,
    unsigned int channel_idx,
    - unsigned char *data,
    + const unsigned char *data,
    unsigned int length,
    void (*packet_sent_callback) (void *cb,
    unsigned int length),
    diff --git a/drivers/char/pcmcia/ipwireless/tty.c b/drivers/char/pcmcia/ipwireless/tty.c
    index 42f3815..b141450 100644
    --- a/drivers/char/pcmcia/ipwireless/tty.c
    +++ b/drivers/char/pcmcia/ipwireless/tty.c
    @@ -259,7 +259,7 @@ static int ipw_write(struct tty_struct *linux_tty,
    }

    ret = ipwireless_send_packet(tty->hardware, IPW_CHANNEL_RAS,
    - (unsigned char *) buf, count,
    + buf, count,
    ipw_write_packet_sent_callback, tty);
    if (ret == -1) {
    mutex_unlock(&tty->ipw_tty_mutex);


    \
     
     \ /
      Last update: 2008-07-19 00:17    [W:0.027 / U:0.064 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site