aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorBruce Allan <bruce.w.allan@intel.com>2010-06-29 14:12:30 -0400
committerDavid S. Miller <davem@davemloft.net>2010-06-30 02:09:18 -0400
commit8eb64e6b856437318ac3de9c73789c9ab54b1589 (patch)
tree61ad1afcf1c01324151882d8a7823621f02d0f6b /drivers/net
parent36f2407fe52c55566221f8c68c8fb808abffd2f5 (diff)
e1000e: suppress compile warnings on certain archs
Commit 84f4ee902ad3ee964b7b3a13d5b7cf9c086e9916 causes compile warnings on architectures that have unsigned long long's that are not 64-bit, e.g. ia64. Signed-off-by: Bruce Allan <bruce.w.allan@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/e1000e/netdev.c38
1 files changed, 21 insertions, 17 deletions
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index 3e53ca723435..6aa795a6160b 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -224,10 +224,10 @@ static void e1000e_dump(struct e1000_adapter *adapter)
224 buffer_info = &tx_ring->buffer_info[tx_ring->next_to_clean]; 224 buffer_info = &tx_ring->buffer_info[tx_ring->next_to_clean];
225 printk(KERN_INFO " %5d %5X %5X %016llX %04X %3X %016llX\n", 225 printk(KERN_INFO " %5d %5X %5X %016llX %04X %3X %016llX\n",
226 0, tx_ring->next_to_use, tx_ring->next_to_clean, 226 0, tx_ring->next_to_use, tx_ring->next_to_clean,
227 (u64)buffer_info->dma, 227 (unsigned long long)buffer_info->dma,
228 buffer_info->length, 228 buffer_info->length,
229 buffer_info->next_to_watch, 229 buffer_info->next_to_watch,
230 (u64)buffer_info->time_stamp); 230 (unsigned long long)buffer_info->time_stamp);
231 231
232 /* Print TX Rings */ 232 /* Print TX Rings */
233 if (!netif_msg_tx_done(adapter)) 233 if (!netif_msg_tx_done(adapter))
@@ -279,9 +279,11 @@ static void e1000e_dump(struct e1000_adapter *adapter)
279 "%04X %3X %016llX %p", 279 "%04X %3X %016llX %p",
280 (!(le64_to_cpu(u0->b) & (1<<29)) ? 'l' : 280 (!(le64_to_cpu(u0->b) & (1<<29)) ? 'l' :
281 ((le64_to_cpu(u0->b) & (1<<20)) ? 'd' : 'c')), i, 281 ((le64_to_cpu(u0->b) & (1<<20)) ? 'd' : 'c')), i,
282 le64_to_cpu(u0->a), le64_to_cpu(u0->b), 282 (unsigned long long)le64_to_cpu(u0->a),
283 (u64)buffer_info->dma, buffer_info->length, 283 (unsigned long long)le64_to_cpu(u0->b),
284 buffer_info->next_to_watch, (u64)buffer_info->time_stamp, 284 (unsigned long long)buffer_info->dma,
285 buffer_info->length, buffer_info->next_to_watch,
286 (unsigned long long)buffer_info->time_stamp,
285 buffer_info->skb); 287 buffer_info->skb);
286 if (i == tx_ring->next_to_use && i == tx_ring->next_to_clean) 288 if (i == tx_ring->next_to_use && i == tx_ring->next_to_clean)
287 printk(KERN_CONT " NTC/U\n"); 289 printk(KERN_CONT " NTC/U\n");
@@ -356,19 +358,19 @@ rx_ring_summary:
356 printk(KERN_INFO "RWB[0x%03X] %016llX " 358 printk(KERN_INFO "RWB[0x%03X] %016llX "
357 "%016llX %016llX %016llX " 359 "%016llX %016llX %016llX "
358 "---------------- %p", i, 360 "---------------- %p", i,
359 le64_to_cpu(u1->a), 361 (unsigned long long)le64_to_cpu(u1->a),
360 le64_to_cpu(u1->b), 362 (unsigned long long)le64_to_cpu(u1->b),
361 le64_to_cpu(u1->c), 363 (unsigned long long)le64_to_cpu(u1->c),
362 le64_to_cpu(u1->d), 364 (unsigned long long)le64_to_cpu(u1->d),
363 buffer_info->skb); 365 buffer_info->skb);
364 } else { 366 } else {
365 printk(KERN_INFO "R [0x%03X] %016llX " 367 printk(KERN_INFO "R [0x%03X] %016llX "
366 "%016llX %016llX %016llX %016llX %p", i, 368 "%016llX %016llX %016llX %016llX %p", i,
367 le64_to_cpu(u1->a), 369 (unsigned long long)le64_to_cpu(u1->a),
368 le64_to_cpu(u1->b), 370 (unsigned long long)le64_to_cpu(u1->b),
369 le64_to_cpu(u1->c), 371 (unsigned long long)le64_to_cpu(u1->c),
370 le64_to_cpu(u1->d), 372 (unsigned long long)le64_to_cpu(u1->d),
371 (u64)buffer_info->dma, 373 (unsigned long long)buffer_info->dma,
372 buffer_info->skb); 374 buffer_info->skb);
373 375
374 if (netif_msg_pktdata(adapter)) 376 if (netif_msg_pktdata(adapter))
@@ -405,9 +407,11 @@ rx_ring_summary:
405 buffer_info = &rx_ring->buffer_info[i]; 407 buffer_info = &rx_ring->buffer_info[i];
406 u0 = (struct my_u0 *)rx_desc; 408 u0 = (struct my_u0 *)rx_desc;
407 printk(KERN_INFO "Rl[0x%03X] %016llX %016llX " 409 printk(KERN_INFO "Rl[0x%03X] %016llX %016llX "
408 "%016llX %p", 410 "%016llX %p", i,
409 i, le64_to_cpu(u0->a), le64_to_cpu(u0->b), 411 (unsigned long long)le64_to_cpu(u0->a),
410 (u64)buffer_info->dma, buffer_info->skb); 412 (unsigned long long)le64_to_cpu(u0->b),
413 (unsigned long long)buffer_info->dma,
414 buffer_info->skb);
411 if (i == rx_ring->next_to_use) 415 if (i == rx_ring->next_to_use)
412 printk(KERN_CONT " NTU\n"); 416 printk(KERN_CONT " NTU\n");
413 else if (i == rx_ring->next_to_clean) 417 else if (i == rx_ring->next_to_clean)