Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
floodlight
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
croft1
floodlight
Commits
fd4f5b0f
Commit
fd4f5b0f
authored
9 years ago
by
Ryan Izard
Browse files
Options
Downloads
Patches
Plain Diff
Fix comment typo. Make shallow compare like my comment intended it to be...
parent
6746952a
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/main/java/net/floodlightcontroller/packet/Ethernet.java
+2
-2
2 additions, 2 deletions
src/main/java/net/floodlightcontroller/packet/Ethernet.java
with
2 additions
and
2 deletions
src/main/java/net/floodlightcontroller/packet/Ethernet.java
+
2
−
2
View file @
fd4f5b0f
...
...
@@ -233,7 +233,7 @@ public class Ethernet extends BasePacket {
@Override
public
IPacket
deserialize
(
byte
[]
data
,
int
offset
,
int
length
)
{
if
(
length
<=
16
)
// Ethernet packet minium should be 60, this is reasonable
if
(
length
<=
16
)
// Ethernet packet mini
m
um should be 60, this is reasonable
return
null
;
ByteBuffer
bb
=
ByteBuffer
.
wrap
(
data
,
offset
,
length
);
if
(
this
.
destinationMACAddress
==
null
)
...
...
@@ -260,7 +260,7 @@ public class Ethernet extends BasePacket {
* loxigen.
*/
EthType
etherType
=
EthType
.
of
(
bb
.
getShort
()
&
0xffff
);
if
(
etherType
.
equals
(
EthType
.
VLAN_FRAME
)
)
{
/* In loxigen, EthType will give the same objects for a given ethertype --> shallow compare. */
if
(
etherType
==
EthType
.
VLAN_FRAME
)
{
/* In loxigen, EthType will give the same objects for a given ethertype --> shallow compare. */
short
tci
=
bb
.
getShort
();
this
.
priorityCode
=
(
byte
)
((
tci
>>
13
)
&
0x07
);
this
.
vlanID
=
(
short
)
(
tci
&
0x0fff
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment