/[orinoco]/orinoco/orinoco.c
ViewVC logotype

Diff of /orinoco/orinoco.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.1.1.24.2.12 by dgibson, Tue Sep 30 05:31:28 2003 UTC revision 1.1.1.24.2.13 by dgibson, Tue Sep 30 05:39:46 2003 UTC
# Line 522  MODULE_PARM(suppress_linkstatus, "i"); Line 522  MODULE_PARM(suppress_linkstatus, "i");
522    
523  #define DUMMY_FID               0xFFFF  #define DUMMY_FID               0xFFFF
524    
 #define RUP_EVEN(a) (((a) + 1) & (~1))  
   
525  /*#define MAX_MULTICAST(priv)   (priv->firmware_type == FIRMWARE_TYPE_AGERE ? \  /*#define MAX_MULTICAST(priv)   (priv->firmware_type == FIRMWARE_TYPE_AGERE ? \
526    HERMES_MAX_MULTICAST : 0)*/    HERMES_MAX_MULTICAST : 0)*/
527  #define MAX_MULTICAST(priv)     (HERMES_MAX_MULTICAST)  #define MAX_MULTICAST(priv)     (HERMES_MAX_MULTICAST)
# Line 539  const long channel_frequency[] = { Line 537  const long channel_frequency[] = {
537  };  };
538  #define NUM_CHANNELS ARRAY_SIZE(channel_frequency)  #define NUM_CHANNELS ARRAY_SIZE(channel_frequency)
539    
540  /* This tables gives the actual meanings of the bitrate IDs returned by the firmware. */  /* This tables gives the actual meanings of the bitrate IDs returned
541     * by the firmware. */
542  struct {  struct {
543          int bitrate; /* in 100s of kilobits */          int bitrate; /* in 100s of kilobits */
544          int automatic;          int automatic;
# Line 1879  static void __orinoco_ev_rx(struct net_d Line 1878  static void __orinoco_ev_rx(struct net_d
1878          }          }
1879    
1880          p = skb_put(skb, data_len);          p = skb_put(skb, data_len);
1881          err = hermes_bap_pread(hw, IRQ_BAP, p, RUP_EVEN(data_len),          err = hermes_bap_pread(hw, IRQ_BAP, p, ALIGN(data_len, 2),
1882                                 rxfid, data_off);                                 rxfid, data_off);
1883          if (err) {          if (err) {
1884                  printk(KERN_ERR "%s: error %d reading frame. "                  printk(KERN_ERR "%s: error %d reading frame. "
# Line 2513  orinoco_xmit(struct sk_buff *skb, struct Line 2512  orinoco_xmit(struct sk_buff *skb, struct
2512          }          }
2513    
2514          /* Round up for odd length packets */          /* Round up for odd length packets */
2515          err = hermes_bap_pwrite(hw, USER_BAP, p, RUP_EVEN(data_len),          err = hermes_bap_pwrite(hw, USER_BAP, p, ALIGN(data_len, 2),
2516                                  txfid, data_off);                                  txfid, data_off);
2517          if (err) {          if (err) {
2518                  printk(KERN_ERR "%s: Error %d writing packet to BAP\n",                  printk(KERN_ERR "%s: Error %d writing packet to BAP\n",

Legend:
Removed from v.1.1.1.24.2.12  
changed lines
  Added in v.1.1.1.24.2.13

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26